[projects/setup] set -e not enable in make; ensure errors are caught
glen
glen at pld-linux.org
Tue Nov 20 10:58:23 CET 2018
commit 02956dd29d8d4062bb6c00da646c98b9bd62602c
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Tue Nov 20 11:52:07 2018 +0200
set -e not enable in make; ensure errors are caught
Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/Makefile b/Makefile
index 8f00aa7..9257a73 100644
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,8 @@ delpasswd: delpasswd.o
clean:
rm -f $(CLEAN)
- cd etc; rm -f $(CLEAN)
- cd etc/profile.d; rm -f $(CLEAN)
+ cd etc && rm -f $(CLEAN)
+ cd etc/profile.d && rm -f $(CLEAN)
install: $(BIN_FILES)
$(INSTALL) -d $(DESTDIR)/$(SBINDIR)
@@ -50,11 +50,11 @@ install: $(BIN_FILES)
$(INSTALL) -d $(DESTDIR)/$(ENVDIR)
$(INSTALL) -d $(DESTDIR)/$(SHRCDIR)
$(INSTALL) $(BIN_FILES) $(DESTDIR)/$(SBINDIR)
- cd etc; $(INSTALL) -m644 $(ETC_FILES) $(DESTDIR)/$(ETCDIR)
+ cd etc && $(INSTALL) -m644 $(ETC_FILES) $(DESTDIR)/$(ETCDIR)
ln -sf /proc/self/mounts $(DESTDIR)/$(ETCDIR)/mtab
- cd etc/profile.d; $(INSTALL) -m755 $(PROFILE_FILES) $(DESTDIR)/$(PROFILEDIR)
- cd etc/env.d; $(INSTALL) -m644 $(ENV_FILES) $(DESTDIR)/$(ENVDIR)
- cd etc/shrc.d; $(INSTALL) -m644 $(SHRC_FILES) $(DESTDIR)/$(SHRCDIR)
+ cd etc/profile.d && $(INSTALL) -m755 $(PROFILE_FILES) $(DESTDIR)/$(PROFILEDIR)
+ cd etc/env.d && $(INSTALL) -m644 $(ENV_FILES) $(DESTDIR)/$(ENVDIR)
+ cd etc/shrc.d && $(INSTALL) -m644 $(SHRC_FILES) $(DESTDIR)/$(SHRCDIR)
dist: changelog clean
$(INSTALL) -d setup-$(VERSION)/etc/profile.d
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/setup.git/commitdiff/c2270ab060eec5f143a9a289098dd728c05377ca
More information about the pld-cvs-commit
mailing list