Changeset 52389b5 for BLFS

Timestamp:

02/27/2012 10:52:29 AM (13 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs

Children:

6cf2868

Parents:

9683707

Message:

Updated BLFS/Makefile so that initial generation of TRACKFILE is more robust

File:

• BLFS/Makefile (modified) (4 diffs)

BLFS/Makefile

@@ -29 +29 @@
 
 define INITIAL_TRACK
-<?xml version="1.0" encoding="ISO-8859-1"?>\
-\
-<!DOCTYPE sublist SYSTEM "$(TOPDIR)/packdesc.dtd">\
-<sublist>\
-  <name>Installed</name>\
+<?xml version="1.0" encoding="ISO-8859-1"?>\n\
+\n\
+<!DOCTYPE sublist SYSTEM "$(TOPDIR)/packdesc.dtd">\n\
+<sublist>\n\
+  <name>Installed</name>\n\
 </sublist>
 endef
@@ -62 +62 @@
         $(Q)rm $@.tmp
 
+# Beware of the echo '$(INITIAL_TRACK)' command below:
+# if default shell is bash, needs echo -e
+# if default shell is sh : echo is enough
+# Don't ask me why
 $(TRACKFILE): $(TRACKING_DIR)
         $(Q)if ! [ -f $@ ]; then \
@@ -68 +72 @@
         $(MAKE) $(PACK_LIST) && \
         for track in $(TRACKING_DIR)/*-*; do \
+        if [ -f $track ]; then \
         pack=$$(echo $$track | sed 's@.*/\(.*\)-[0-9c].*@\1@') && \
         xsltproc --stringparam packages $(PACK_LIST) \
@@ -74 +79 @@
         sed -i 's@PACKDESC@$(TOPDIR)/packdesc.dtd@' track.tmp && \
         xmllint --format --postvalid track.tmp > $@; \
+        fi; \
         done; \
         rm -f track.tmp; \