mirror of
https://github.com/Zeckmathederg/glfs.git
synced 2025-01-23 14:32:13 +08:00
Revert "Makefile: use a "by-the-book" way to detect build environment change"
This reverts commit 41275f9aac
.
This commit is contained in:
parent
f6065b4995
commit
05d5b11202
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,4 +3,3 @@ version.ent
|
|||||||
blfs-bootscripts*
|
blfs-bootscripts*
|
||||||
xxx
|
xxx
|
||||||
*.swp
|
*.swp
|
||||||
build-env
|
|
||||||
|
22
Makefile
22
Makefile
@ -34,6 +34,12 @@ ifneq ($(REV), sysv)
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Let's get the previous REV: it'll be used to see if we should
|
||||||
|
# rebuild version.ent
|
||||||
|
PREVREV != if [ -f conditional.ent ]; then \
|
||||||
|
gawk '/INCLUDE/{ print $$3 }' conditional.ent; \
|
||||||
|
fi
|
||||||
|
|
||||||
ifeq ($(REV), sysv)
|
ifeq ($(REV), sysv)
|
||||||
BASEDIR ?= $(HOME)/public_html/blfs-book
|
BASEDIR ?= $(HOME)/public_html/blfs-book
|
||||||
NOCHUNKS_OUTPUT ?= blfs-book.html
|
NOCHUNKS_OUTPUT ?= blfs-book.html
|
||||||
@ -273,7 +279,12 @@ $(DUMPDIR): $(RENDERTMP)/$(BLFSFULL)
|
|||||||
validate profile-html blfs-patch-list wget-list \
|
validate profile-html blfs-patch-list wget-list \
|
||||||
test-links dump-commands bootscripts systemd-units
|
test-links dump-commands bootscripts systemd-units
|
||||||
|
|
||||||
version.ent: general.ent packages.ent gnome.ent $(ALLXML) $(ALLXSL) build-env
|
# make version.ent unconditionally if we have changed REV
|
||||||
|
ifneq ($(REV), $(PREVREV))
|
||||||
|
.PHONY: version.ent
|
||||||
|
endif
|
||||||
|
|
||||||
|
version.ent: general.ent packages.ent gnome.ent $(ALLXML) $(ALLXSL)
|
||||||
$(Q)./git-version.sh $(REV)
|
$(Q)./git-version.sh $(REV)
|
||||||
|
|
||||||
#ALL_PYTHON_DEPS := $(filter-out $(PYHOSTED), \
|
#ALL_PYTHON_DEPS := $(filter-out $(PYHOSTED), \
|
||||||
@ -298,12 +309,3 @@ version.ent: general.ent packages.ent gnome.ent $(ALLXML) $(ALLXSL) build-env
|
|||||||
# stylesheets/pythonhosted.xsl \
|
# stylesheets/pythonhosted.xsl \
|
||||||
# general/prog/python-modules.xml
|
# general/prog/python-modules.xml
|
||||||
# $(Q)mv temp.xml $@
|
# $(Q)mv temp.xml $@
|
||||||
|
|
||||||
.PHONY: update-build-env
|
|
||||||
update-build-env:
|
|
||||||
$(Q)echo REV=$(REV) > $@.new
|
|
||||||
$(Q)echo BASEDIR=$(BASEDIR) >> $@.new
|
|
||||||
$(Q)diff $@.new $@ 2>/dev/null >/dev/null || mv $@.new $@
|
|
||||||
$(Q)rm -f $@.new
|
|
||||||
|
|
||||||
build-env: update-build-env
|
|
||||||
|
Loading…
Reference in New Issue
Block a user