Author: pierre Date: Wed Aug 9 06:29:01 2017 New Revision: 3983 Log: 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
Modified: jhalfs/branches/2.4/BLFS/Makefile Modified: jhalfs/branches/2.4/BLFS/Makefile ============================================================================== --- jhalfs/branches/2.4/BLFS/Makefile Wed Aug 9 06:25:26 2017 (r3982) +++ jhalfs/branches/2.4/BLFS/Makefile Wed Aug 9 06:29:01 2017 (r3983) @@ -1,5 +1,5 @@ # From the Build Scripts Written By: Jim Gifford <[email protected]> -# Modified By: Joe Ciccone <[email protected] +# Modified By: Joe Ciccone <[email protected]> # Additional changes: George Boudreau <[email protected]> # Pierre Labastie <pierre.labastie at neuf.fr> @@ -111,11 +111,10 @@ $(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 @@ -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 -- http://lists.linuxfromscratch.org/listinfo/alfs-log Unsubscribe: See the above information page
