From ed9acf79d44a37a4bbe0da77c52332c6ef11b6da Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 9 Aug 2017 13:29:01 +0000 Subject: [PATCH] Merge trunk rev 3982: BLFS/Makefile: - Do not call make after inititalizing the tracking file - Remove the file from tracking dir after using it - Fix a typo --- BLFS/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/BLFS/Makefile b/BLFS/Makefile index a190f9a..02cc5d2 100644 --- a/BLFS/Makefile +++ b/BLFS/Makefile @@ -1,5 +1,5 @@ # From the Build Scripts Written By: Jim Gifford -# Modified By: Joe Ciccone # Additional changes: George Boudreau # Pierre Labastie @@ -111,11 +111,10 @@ $(PACK_LIST): $(XSLDIR)/gen_pkg_list.xsl $(XSLDIR)/specialCases.xsl $(TRACKFILE) $(TRACKFILE): $(TRACKING_DIR) $(Q)if ! [ -f $@ ]; then \ echo Initializing $(TRACKFILE) && \ - /bin/echo -e '$(INITIAL_TRACK)' > $@ && \ - $(MAKE) $(PACK_LIST); \ + /bin/echo -e '$(INITIAL_TRACK)' > $@; \ fi $(Q)for track in $(TRACKING_DIR)/*-*; do \ - if [ -f $$track ]; then \ + if [ -f $$track ]; then \ pack=$$(echo $$track | sed 's@.*/\(.*\)-[0-9c].*@\1@') && \ version=$$(echo $$track | sed 's@.*-\([0-9c].*\)@\1@') && \ xsltproc --stringparam packages $(PACK_LIST) \ @@ -124,7 +123,8 @@ $(TRACKFILE): $(TRACKING_DIR) -o track.tmp $(XSLDIR)/bump.xsl $@ && \ sed -i 's@PACKDESC@$(TOPDIR)/packdesc.dtd@' track.tmp && \ xmllint --format --postvalid track.tmp > $@; \ - fi; \ + fi; \ + rm -f $$track; \ done; \ rm -f track.tmp