Changeset 34986b8

Timestamp:

03/07/2012 09:38:18 PM (12 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs

Children:

2507cf7

Parents:

f3a500d

Message:

Add the version parameter of bump.xsl to Makefile
Separates first install of instpkg.xml from subsequent updates due to
new packages present in TRACK_DIR

File:

• BLFS/Makefile (modified) (2 diffs)

BLFS/Makefile

@@ -70 +70 @@
         echo Initializing $(TRACKFILE) && \
         echo '$(INITIAL_TRACK)' > $@ && \
-        $(MAKE) $(PACK_LIST) && \
-        for track in $(TRACKING_DIR)/*-*; do \
-        if [ -f $track ]; then \
+        $(MAKE) $(PACK_LIST); \
+        fi
+        @for track in $(TRACKING_DIR)/*-*; do \
+        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) \
         --stringparam package $$pack \
+        --stringparam version $$version \
         -o track.tmp $(XSLDIR)/bump.xsl $@ && \
         sed -i 's@PACKDESC@$(TOPDIR)/packdesc.dtd@' track.tmp && \
@@ -81 +84 @@
         fi; \
         done; \
-        rm -f track.tmp; \
-        fi
+        rm -f track.tmp
 
 $(TRACKING_DIR):