cleanup: move buildconfig.lua installation to local/ subdirectory

Signed-off-by: Gordon Hecker <gh@emlix.com>

diff --git a/Makefile b/Makefile
index 962e6facb7ad4898ce17a68438093462293a4d5d..7f5267fc2dc089e5c6ca6e56ad8675a066107ce1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -115,7 +115,6 @@ install-local:
        $(MAKE) -C local install-local
        $(MAKE) -C templates install-local
        $(MAKE) -C extensions install-local
-       install -m 644 buildconfig.lua $(LOCALLIBDIR)
 
 doc:
        for s in $(SUBDIRS) ; do \

diff --git a/local/Makefile b/local/Makefile
index d26e12dec9ccf38ef57a7919b9fe30daf63ec261..27515bcee27e9b22401aee31a1e8603058873acf 100644 (file)
--- a/local/Makefile
+++ b/local/Makefile
@@ -32,7 +32,7 @@ TOPLEVEL = ..
 
 include $(TOPLEVEL)/make.vars
 
-VPATH = .:$(TOPLEVEL)/generic
+VPATH = .:$(TOPLEVEL)/generic:$(TOPLEVEL)
 
 CLEAN_FILES = *~ *.so linux32 *.lc *.o
 CFLAGS += -I. -I$(DESTDIR)$(INCDIR) -I$(DESTDIR)$(INCDIR)/lua-$(LUA_VERSION) \
@@ -47,7 +47,7 @@ LUA_LIBS += e2tool.lua scm.lua git.lua svn.lua cvs.lua files.lua
 LUA_LIBS += tools.lua transport.lua cache.lua
 LUA_LIBS += environment.lua plugin.lua url.lua hash.lua lock.lua
 LUA_LIBS += policy.lua strict.lua collection.lua e2build.lua
-LUA_LIBS += e2lib.lua
+LUA_LIBS += e2lib.lua buildconfig.lua
 LOCALTOOLS = $(LOCALSHTOOLS) $(LOCALLUATOOLS)
 
 SYMLINKS_2_1 = lookup-server use-source prepare-cargo sync-results cleanup \