r3593 - jhalfs/branches/ablfs/BLFS

pierre at linuxfromscratch.org pierre at linuxfromscratch.org
Wed Mar 7 13:38:23 PST 2012


Author: pierre
Date: 2012-03-07 14:38:18 -0700 (Wed, 07 Mar 2012)
New Revision: 3593

Modified:
   jhalfs/branches/ablfs/BLFS/Makefile
Log:
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

Modified: jhalfs/branches/ablfs/BLFS/Makefile
===================================================================
--- jhalfs/branches/ablfs/BLFS/Makefile	2012-03-07 21:32:03 UTC (rev 3592)
+++ jhalfs/branches/ablfs/BLFS/Makefile	2012-03-07 21:38:18 UTC (rev 3593)
@@ -69,19 +69,21 @@
 	$(Q)if ! [ -f $@ ]; then \
 	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 at .*/\(.*\)-[0-9c].*@\1@') && \
+	version=$$(echo $$track | sed 's at .*-\([0-9c].*\)@\1@') && \
 	xsltproc --stringparam packages $(PACK_LIST) \
 	--stringparam package $$pack \
+	--stringparam version $$version \
 	-o track.tmp $(XSLDIR)/bump.xsl $@ && \
 	sed -i 's at PACKDESC@$(TOPDIR)/packdesc.dtd@' track.tmp && \
 	xmllint --format --postvalid track.tmp > $@; \
         fi; \
 	done; \
-	rm -f track.tmp; \
-	fi
+	rm -f track.tmp
 
 $(TRACKING_DIR):
 	@echo Creating $(TRACKING_DIR)




More information about the alfs-log mailing list