Fixed DESTDIR make install/uninstall and break immediately on errors

This commit is contained in:
Olof hagsand 2017-11-22 22:21:12 +01:00
parent 496754f5c5
commit 96a7ec86f0
16 changed files with 115 additions and 39 deletions

View file

@ -55,20 +55,20 @@ $(SUBDIRS):
(cd $@; $(MAKE) $(MFLAGS) all)
install:
for i in $(SUBDIRS); \
do (cd $$i; $(MAKE) $(MFLAGS) $@); done
for i in $(SUBDIRS); \
do (cd $$i && $(MAKE) $(MFLAGS) $@); done
install-include:
for i in $(SUBDIRS); \
do (cd $$i; $(MAKE) $(MFLAGS) $@); done; \
(cd clixon; $(MAKE) $(MFLAGS) $@)
for i in $(SUBDIRS); \
do (cd $$i; $(MAKE) $(MFLAGS) $@)||exit 1; done; \
(cd clixon; $(MAKE) $(MFLAGS) $@)
uninstall:
for i in $(SUBDIRS); \
do (cd $$i; $(MAKE) $(MFLAGS) $@); done
for i in $(SUBDIRS); \
do (cd $$i; $(MAKE) $(MFLAGS) $@)||exit 1; done
config.status: configure
$(SHELL) config.status --recheck
$(SHELL) config.status --recheck
clean:
for i in $(SUBDIRS); \

View file

@ -48,7 +48,7 @@ install-include:
install -m 644 *.h $(DESTDIR)$(includedir)/clixon
uninstall:
rm -f $(includedir)/clixon
rm -rf $(DESTDIR)$(includedir)/clixon
clean:

View file

@ -187,7 +187,7 @@ install-lib: $(MYLIB)
ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclixon.so
uninstall:
rm -f $(libdir)/$(MYLIB)
rm -f $(DESTDIR)$(libdir)/$(MYLIBLINK)*
TAGS:
find . -name '*.[chyl]' -print | etags -