Makefile: explicitly pass build variables to genscript.sh

Use $(GENSCRIPT) to call the script from any Makefile

Signed-off-by: Tobias Ulmer <tu@emlix.com>

diff --git a/generic/Makefile b/generic/Makefile
index cd019ac38aaca5c60efc0d2e0ac24840054aa965..6e6ba1aa6b30e1bb588621870872dbe4c3940238 100644 (file)
--- a/generic/Makefile
+++ b/generic/Makefile
@@ -61,7 +61,7 @@ clean:
        rm -f $(CLEAN_FILES)
 
 %: %.in
-       $(TOPLEVEL)/scripts/genscript.sh $< $@
+       $(GENSCRIPT) $< $@
 
 %.o: %.c
        $(CC) $(CFLAGS) $(LUA_CPPFLAGS) $(LDFLAGS) -fPIC -o $@ -c $<

diff --git a/global/Makefile b/global/Makefile
index 5ad26a4c577c6167d84fde328077d88be19376ab..616f1f2bfa743556024a7c6c4c67a05969bb10ff 100644 (file)
--- a/global/Makefile
+++ b/global/Makefile
@@ -106,17 +106,17 @@ clean:
        rm -f $(CLEAN_FILES)
 
 %.lua: %.lua.in
-       $(TOPLEVEL)/scripts/genscript.sh $< $@
+       $(GENSCRIPT) $< $@
 
 %.sh: %.sh.in
-       $(TOPLEVEL)/scripts/genscript.sh $< $@
+       $(GENSCRIPT) $< $@
 
 e2: e2.lua
        echo "#!$(LIBEXECDIR)/e2-lua-$(LUA_VERSION)" >$@
        cat $< >>$@
 
 e2.conf: e2.conf.in
-       $(TOPLEVEL)/scripts/genscript.sh $< $@
+       $(GENSCRIPT) $< $@
 
 sha1.so: sha1.o lsha1.o
 

diff --git a/local/Makefile b/local/Makefile
index 1f4e311c626bea3a762514b968f636b4b91723d8..b56922e6fce412d47b50af82c90adfff92e0d3c6 100644 (file)
--- a/local/Makefile
+++ b/local/Makefile
@@ -108,7 +108,7 @@ clean:
        rm -f $(CLEAN_FILES)
 
 %: %.in
-       $(TOPLEVEL)/scripts/genscript.sh $< $@
+       $(GENSCRIPT) $< $@
 
 linux32: linux32.c
 

diff --git a/make.vars b/make.vars
index 5cd46deaa325dc4ddcd6f8bd42670b6e1751a5f3..026f59211696c4b0cd5980ff3bebab73c481a7a4 100644 (file)
--- a/make.vars
+++ b/make.vars
@@ -112,4 +112,15 @@ E2_SU_CFLAGS =     -D CHROOT_TOOL="\"$(CHROOT_TOOL)\""     \
 E2_GROUP = ebs
 export E2_GROUP
 
+GENSCRIPT = env PREFIX=$(PREFIX) BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) \
+           LIBEXECDIR=$(LIBEXECDIR) LOCALSTATEDIR=$(LOCALSTATEDIR) \
+           SYSCONFDIR=$(SYSCONFDIR) E2DATA=$(E2DATA) TOOLDIR=$(TOOLDIR) \
+           LUA_VERSION=$(LUA_VERSION) ARCH=$(ARCH) \
+           BINARY_STORE=$(BINARY_STORE) E2_GROUP=$(E2_GROUP) \
+           ENV_TOOL=$(ENV_TOOL) CHROOT_TOOL=$(CHROOT_TOOL) \
+           TAR_TOOL=$(TAR_TOOL) CHOWN_TOOL=$(CHOWN_TOOL) \
+           RM_TOOL=$(RM_TOOL) DEFAULT_LOCAL_BRANCH=$(DEFAULT_LOCAL_BRANCH) \
+           DEFAULT_LOCAL_TAG=$(DEFAULT_LOCAL_TAG) \
+           $(TOPLEVEL)/scripts/genscript.sh
+
 # vim: ft=make

diff --git a/templates/Makefile b/templates/Makefile
index 80ce7d1a90c352ffd274d8d26da202db219f68ca..a739bec20b3d7971e9cc4de1b74f115a094c161e 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -53,7 +53,7 @@ install-local: all
        install -m 644 local/source.svn $(LOCALLIBDIR)/templates/
 
 %.sh: %.sh.in
-       $(TOPLEVEL)/scripts/genscript.sh $< $@
+       $(GENSCRIPT) $< $@
 
 uninstall:
        # do not remove possibly valuable templates