Changeset ed9acf7 for BLFS/Makefile

Timestamp:

08/09/2017 01:29:01 PM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4

Children:

9f6ceb0

Parents:

3917eca

Message:

Merge trunk rev 3982: BLFS/Makefile:

• Do not call make after inititalizing the tracking file
• Remove the <package-version> file from tracking dir after using it
• Fix a typo

File:

• BLFS/Makefile (modified) (3 diffs)

BLFS/Makefile

@@ -1 +1 @@
 # From the Build Scripts Written By: Jim Gifford <lfs@jg555.com>
-# Modified By: Joe Ciccone <jciccone@linuxfromscratch.org
+# Modified By: Joe Ciccone <jciccone@linuxfromscratch.org>
 # Additional changes: George Boudreau <georgeb@linuxfromscratch.org>
 #                     Pierre Labastie <pierre.labastie at neuf.fr>
@@ -112 +112 @@
         $(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@') && \
@@ -125 +124 @@
         sed -i 's@PACKDESC@$(TOPDIR)/packdesc.dtd@' track.tmp && \
         xmllint --format --postvalid track.tmp > $@; \
-        fi; \
+        fi; \
+        rm -f $$track; \
         done; \
         rm -f track.tmp