Changeset 5c8df43

Timestamp:

01/20/2023 09:05:38 AM (16 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

b39eb29

Parents:

951d334

Message:

Adapt BLFS/Makefile to the new book layout

With the change to python modules and the pythonhosted.xml file
becoming untracked, those changes allow creating/updating this
file.

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 \
@@ -171 +176 @@
 $(BLFS_FULL): $(BLFS_XML) $(BLFS_XML)/general.ent $(ALLXML) $(ALLXSL)
         $(Q)cd $(BLFS_XML) && if [ -x git-version.sh ] ; then \
-             echo "Processing BLFS version..."; \
-             ./git-version.sh $(REV); \
-        fi
+            echo "Processing BLFS version...";                \
+            if grep -q PYHOSTED Makefile; then                \
+               $(MAKE) -C $(BLFS_XML) REV=$(REV) $(PYHOSTED); \
+            else                                              \
+               ./git-version.sh $(REV);                       \
+            fi;                                               \
+        fi
         $(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
         @echo "Adjusting BLFS for revision $(REV)..."
@@ -231 +240 @@
 
 FORCE:
-.PHONY: clean all update $(CONFIG_OUT) version FORCE
+.PHONY: clean all update $(CONFIG_OUT) FORCE