Changeset b39eb29

Timestamp:

01/25/2023 12:17:12 PM (15 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

3940a45

Parents:

5c8df43

Message:

Revert changes to BLFS/Makefile

Changes to book's Makefile have been reverted too...

File:

• BLFS/Makefile (modified) (3 diffs)

BLFS/Makefile

@@ -61 +61 @@
 BLFS-BRANCH = trunk
 
-# Name of a file that is not tracked by git in BLFS_XML
-# but has to be updated
-PYHOSTED = general/prog/python-dependencies/pythonhosted.xml
-
 ALLXML := $(filter-out $(RENDERTMP)/%, \
-            $(filter-out $(BLFS_XML)/$(PYHOSTED), \
               $(shell if [ -d $(BLFS_XML) ]; then \
                         find $(BLFS_XML) -name \*.xml; \
-                      fi)))
+                      fi))
 ALLXMLLFS:= $(filter-out $(LFSTMP)/%, \
               $(shell if [ -d $(LFS_XML) ]; then \
@@ -176 +171 @@
 $(BLFS_FULL): $(BLFS_XML) $(BLFS_XML)/general.ent $(ALLXML) $(ALLXSL)
         $(Q)cd $(BLFS_XML) && if [ -x git-version.sh ] ; then \
-            echo "Processing BLFS version...";                \
-            if grep -q PYHOSTED Makefile; then                \
-               $(MAKE) -C $(BLFS_XML) REV=$(REV) $(PYHOSTED); \
-            else                                              \
-               ./git-version.sh $(REV);                       \
-            fi;                                               \
-        fi
+             echo "Processing BLFS version..."; \
+             ./git-version.sh $(REV); \
+        fi
         $(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
         @echo "Adjusting BLFS for revision $(REV)..."
@@ -240 +231 @@
 
 FORCE:
-.PHONY: clean all update $(CONFIG_OUT) FORCE
+.PHONY: clean all update $(CONFIG_OUT) version FORCE