]> git.pld-linux.org Git - projects/setup.git/commitdiff
set -e not enable in make; ensure errors are caught
authorElan Ruusamäe <glen@pld-linux.org>
Tue, 20 Nov 2018 09:52:07 +0000 (11:52 +0200)
committerElan Ruusamäe <glen@pld-linux.org>
Tue, 20 Nov 2018 09:52:07 +0000 (11:52 +0200)
Makefile

index 8f00aa72301f9187377c8ec7dbee516dbb24ee72..9257a73991cd6d461bcb050af47e33d38405b76a 100644 (file)
--- 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
This page took 0.592693 seconds and 4 git commands to generate.