From: Tobias Ulmer <tu@emlix.com>
Date: Mon, 24 Jun 2013 15:46:13 +0000 (+0200)
Subject: Cleanup Makefiles, move files in the right place, stop abusing VPATH
X-Git-Tag: e2factory-2.3.15rc1~482
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=fac0cafeddd1f8b91de3393a0e08726d17d7f5a7;p=e2factory.git

Cleanup Makefiles, move files in the right place, stop abusing VPATH

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

diff --git a/Makefile b/Makefile
index 3eea8f7..c9faa72 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,7 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-SUBDIRS    = lua generic global doc templates extensions
-LOCALSUBDIRS    = lua generic global local doc
+SUBDIRS    = lua generic global local plugins doc templates extensions
 TOPLEVEL    = .
 
 include $(TOPLEVEL)/make.vars
@@ -34,7 +33,7 @@ include $(TOPLEVEL)/make.vars
 CLEAN_FILES = *~ buildconfig.lua
 
 
-.PHONY: all e2commit install install-local clean local localdist uninstall \
+.PHONY: all install install-local clean local localdist uninstall \
 	doc buildconfig.lua tags
 
 help:
@@ -65,46 +64,51 @@ buildconfig.lua: Makefile make.vars
 	set -e; for x in $(SYNTAX) ; do echo " \"$$x\"," ; done >>$@
 	echo '}' >>$@
 
-all: e2commit buildconfig.lua
-	$(MAKE) -C lua
-	$(MAKE) -C generic
-	$(MAKE) -C global
-	$(MAKE) -C doc/man
-	$(MAKE) -C templates all
-	$(MAKE) -C extensions all
+all: buildconfig.lua
+	set -e; for s in $(SUBDIRS) ; do \
+		$(MAKE) -C $$s $@ ;\
+	done
+	#$(MAKE) -C lua
+	#$(MAKE) -C generic
+	#$(MAKE) -C global
+	#$(MAKE) -C doc/man
+	#$(MAKE) -C templates all
+	#$(MAKE) -C extensions all
 
 install: all
-	$(MAKE) -C global install
-	$(MAKE) -C lua install
-	$(MAKE) -C generic install
-	$(MAKE) -C local install
-	$(MAKE) -C doc/man install
-	$(MAKE) -C templates install
-	$(MAKE) -C extensions install
+	install -d $(DESTDIR)$(LIBDIR)
+	install -m 644 buildconfig.lua $(DESTDIR)$(LIBDIR)
+	set -e; for s in $(SUBDIRS) ; do \
+		$(MAKE) -C $$s $@ ;\
+	done
+	#$(MAKE) -C global install
+	#$(MAKE) -C lua install
+	#$(MAKE) -C generic install
+	#$(MAKE) -C local install
+	#$(MAKE) -C doc/man install
+	#$(MAKE) -C templates install
+	#$(MAKE) -C extensions install
 
 uninstall:
-	$(MAKE) -C lua uninstall
-	$(MAKE) -C generic uninstall
-	$(MAKE) -C global uninstall
-	$(MAKE) -C doc/man uninstall
-	$(MAKE) -C templates uninstall
-	$(MAKE) -C local uninstall
-	$(MAKE) -C extensions uninstall
+	set -e; for s in $(SUBDIRS) ; do \
+		$(MAKE) -C $$s $@ ;\
+	done
 	rm -f $(DESTDIR)$(LIBDIR)/buildconfig.lua
-	rmdir -p $(DESTDIR)$(TOOLDIR) >/dev/null 2>&1 || :
-	rmdir -p $(DESTDIR)$(MANDIR) >/dev/null 2>&1 || :
-	rmdir -p $(DESTDIR)$(INCDIR) >/dev/null 2>&1 || :
-	rmdir -p $(DESTDIR)$(LIBEXECDIR) >/dev/null 2>&1 || :
-	rmdir -p $(DESTDIR)$(LIBDIR) >/dev/null 2>&1 || :
-	rmdir -p $(DESTDIR)$(BINDIR) >/dev/null 2>&1 || :
-
-local: e2commit buildconfig.lua
-	$(MAKE) -C generic local
-	$(MAKE) -C local
-	$(MAKE) -C templates local
-	$(MAKE) -C extensions local
-
-install-local:
+	rmdir -p $(DESTDIR)$(LIBDIR) || true
+	rmdir -p $(DESTDIR)$(DOCDIR) || true
+	#rmdir -p $(DESTDIR)$(TOOLDIR) >/dev/null 2>&1 || :
+	#rmdir -p $(DESTDIR)$(MANDIR) >/dev/null 2>&1 || :
+	#rmdir -p $(DESTDIR)$(INCDIR) >/dev/null 2>&1 || :
+	#rmdir -p $(DESTDIR)$(LIBEXECDIR) >/dev/null 2>&1 || :
+	#rmdir -p $(DESTDIR)$(LIBDIR) >/dev/null 2>&1 || :
+	#rmdir -p $(DESTDIR)$(BINDIR) >/dev/null 2>&1 || :
+
+local: buildconfig.lua
+	set -e; for s in $(SUBDIRS) ; do \
+		$(MAKE) -C $$s $@ ;\
+	done
+
+install-local: local
 	$(BINDIR)/e2-locate-project-root
 	@echo removing old installation...
 	rm -rf $(LOCALBINDIR)
@@ -113,11 +117,17 @@ install-local:
 	rm -rf $(LOCALDOCDIR)
 	@echo removing old plugins...
 	rm -rf $(LOCALPLUGINDIR)
-	$(MAKE) -C generic install-local
-	$(MAKE) -C local install-local
-	$(MAKE) -C templates install-local
-	$(MAKE) -C extensions install-local
-	$(MAKE) -C doc install-local
+	#$(MAKE) -C generic install-local
+	#$(MAKE) -C local install-local
+	#$(MAKE) -C plugins install-local
+	#$(MAKE) -C templates install-local
+	#$(MAKE) -C extensions install-local
+	#$(MAKE) -C doc install-local
+	install -d $(LOCALLIBDIR)
+	install -m 644 buildconfig.lua $(LOCALLIBDIR)
+	set -e; for s in $(SUBDIRS) ; do \
+		$(MAKE) -C $$s $@ ;\
+	done
 
 doc:
 	set -e; for s in $(SUBDIRS) ; do \
@@ -125,41 +135,17 @@ doc:
 	done
 
 install-doc:
-	install -d -m 755 $(DOCDIR)
+	install -d -m 755 $(DESTDIR)$(DOCDIR)
+	install -m 644 Changelog $(DESTDIR)$(DOCDIR)/
 	set -e; for s in $(SUBDIRS) ; do \
 		$(MAKE) -C $$s $@ ;\
 	done
-	install -m 644 Changelog $(DOCDIR)/
 
 clean:
+	rm -f $(CLEAN_FILES)
 	set -e; for s in $(SUBDIRS) ; do \
 		$(MAKE) -C $$s $@ ;\
 	done
-	set -e; for s in $(LOCALSUBDIRS) ; do \
-		$(MAKE) -C $$s $@ ; \
-	done
-	rm -f $(CLEAN_FILES)
-
-localdist: all
-	if test -z "$(DISTNAME)"; then \
-	  echo; \
-	  echo "please re-invoke with DISTNAME set to the tag you want to package"; \
-	  echo; \
-	  exit 1; \
-	fi
-	rm -fr dist
-	$(MAKE) -C local PROJECTDIR=$$PWD/dist install-local
-	$(MAKE) -C generic PROJECTDIR=$$PWD/dist install-local
-	tar -czvf e2-$(DISTNAME)-$(ARCH)-local.tar.gz -C dist .e2
-	rm -fr dist
-
-dist:
-	git archive --format=tar --prefix=$(PACKAGE)/ $(PACKAGE) \
-							>$(PACKAGE).tar
-	gzip <$(PACKAGE).tar >$(PACKAGE).tar.gz
-
-tag:
-	git tag $(TAG)
 
 showtag:
 	@echo $(TAG)
diff --git a/doc/Makefile b/doc/Makefile
index bbf9b19..c981c18 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -32,7 +32,7 @@ include $(TOPLEVEL)/make.vars
 
 CLEAN_FILES = documentation.tar.gz
 
-.PHONY: all e2commit install install-local clean local localdist uninstall \
+.PHONY: all install install-local clean local localdist uninstall \
 	doc
 
 all:
@@ -86,14 +86,3 @@ clean:
 	done
 	rm -fr documentation
 	rm -f $(CLEAN_FILES)
-
-check:
-	set -e; for s in $(SUBDIRS) do ;\
-		$(MAKE) -C $$s $@ ;\
-	done
-
-localdist:
-	set -e; for s in $(SUBDIRS) do ;\
-		$(MAKE) -C $$s $@ ;\
-	done
-
diff --git a/doc/developer/Makefile b/doc/developer/Makefile
index 7d19c03..bfdf9e8 100644
--- a/doc/developer/Makefile
+++ b/doc/developer/Makefile
@@ -34,7 +34,7 @@ include $(TOPLEVEL)/make.vars
 
 CLEAN_FILES = e2factory.tar.gz
 
-.PHONY: all e2commit install install-local clean local localdist uninstall \
+.PHONY: all install install-local clean local localdist uninstall \
 	doc
 
 all:
@@ -78,16 +78,6 @@ clean: clean-doc
 	done
 	rm -f $(CLEAN_FILES)
 
-check:
-	set -e; for s in $(SUBDIRS) do ;\
-		$(MAKE) -C $$s $@ ;\
-	done
-
-localdist:
-	set -e; for s in $(SUBDIRS) do ;\
-		$(MAKE) -C $$s $@ ;\
-	done
-
 $(LDOC):
 	$(MAKE) -C $(TOPLEVEL)/doc/ldoc
 
diff --git a/doc/ldoc/Makefile b/doc/ldoc/Makefile
index c5d8769..a5b3209 100644
--- a/doc/ldoc/Makefile
+++ b/doc/ldoc/Makefile
@@ -5,8 +5,7 @@ include $(TOPLEVEL)/make.vars
 
 CLEAN_FILES = ldoc
 
-.PHONY: all install install-local clean local uninstall doc install-doc check \
-	localdist
+.PHONY: all install install-local clean local uninstall doc install-doc
 
 all: ldoc
 	set -e; for s in $(SUBDIRS) ; do \
@@ -49,16 +48,6 @@ clean: clean-lua-5.1.3 clean-luafilesystem-1.6.2
 	done
 	rm -f $(CLEAN_FILES)
 
-check:
-	set -e; for s in $(SUBDIRS) do ;\
-		$(MAKE) -C $$s $@ ;\
-	done
-
-localdist:
-	set -e; for s in $(SUBDIRS) do ;\
-		$(MAKE) -C $$s $@ ;\
-	done
-
 lua-5.1.3:
 	cp -Rp $(TOPLEVEL)/lua/lua-5.1.3 lua-5.1.3
 	$(MAKE) -C lua-5.1.3/src clean
diff --git a/doc/man/Makefile b/doc/man/Makefile
index adb2301..fa399b5 100644
--- a/doc/man/Makefile
+++ b/doc/man/Makefile
@@ -95,8 +95,3 @@ install-doc:
 clean:
 	rm -f $(CLEAN_FILES)
 	rm -fr html man
-
-check:
-
-localdist:
-
diff --git a/generic/Makefile b/generic/Makefile
index 6e6ba1a..d2ba8a8 100644
--- a/generic/Makefile
+++ b/generic/Makefile
@@ -25,43 +25,66 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-### Makefile for "generic" e2 subdirectory
-
-
 TOPLEVEL = ..
 
 include $(TOPLEVEL)/make.vars
 
+LUA_LIBS = strict.lua plugin.lua e2lib.lua
+LUA_LIBS += e2option.lua hash.lua tools.lua transport.lua cache.lua url.lua
+LUA_LIBS += generic_git.lua luafile.lua err.lua lock.lua
+
 CLEAN_FILES = *~ *.o *.so
 
 
 .PHONY: all install uninstall local install-local clean
 
-all:
+all: sha1.so luafile_ll.so e2util.so
+
+sha1.so: sha1.o lsha1.o
+
+luafile_ll.so: luafile_ll.o
+
+e2util.so: e2util.o
 
 install: all
+	install -d $(DESTDIR)$(LIBDIR)
+	install -m 644 $(LUA_LIBS) $(DESTDIR)$(LIBDIR)
+	install -m 644 sha1.so $(DESTDIR)$(LIBDIR)
+	install -m 644 luafile_ll.so $(DESTDIR)$(LIBDIR)
+	install -m 644 e2util.so $(DESTDIR)$(LIBDIR)
 
 uninstall:
+	rm -f  $(DESTDIR)$(LIBDIR)/sha1.so
+	rm -f  $(DESTDIR)$(LIBDIR)/luafile_ll.so
+	rm -f  $(DESTDIR)$(LIBDIR)/e2util.so
+	set -e; for f in $(LUA_LIBS); do \
+		rm -f "$(DESTDIR)$(LIBDIR)/$$f"; \
+	done
+	rmdir -p $(DESTDIR)$(LIBDIR) || true
 
-local:
+local: sha1.so luafile_ll.so e2util.so
 
 install-local: local
+	install -d $(LOCALLIBDIR)
+	install -m 644 sha1.so $(LOCALLIBDIR)
+	install -m 644 luafile_ll.so $(LOCALLIBDIR)
+	install -m 644 e2util.so $(LOCALLIBDIR)
+
+uninstall-local:
+	rm -f  $(LOCALLIBDIR)/sha1.so
+	rm -f  $(LOCALLIBDIR)/luafile_ll.so
+	rm -f $(LOCALLIBDIR)/e2util.so
+	rmdir -p $(LOCALLIBDIR) || true
 
 doc:
-	set -e; for s in $(SUBDIRS) ; do \
-		$(MAKE) -C $$s $@ ;\
-	done
 
 install-doc:
-	set -e; for s in $(SUBDIRS) ; do \
-		$(MAKE) -C $$s $@ ;\
-	done
 
 clean:
 	rm -f $(CLEAN_FILES)
 
-%: %.in
-	$(GENSCRIPT) $< $@
-
 %.o: %.c
-	$(CC) $(CFLAGS) $(LUA_CPPFLAGS) $(LDFLAGS) -fPIC -o $@ -c $<
+	$(CC) $(CFLAGS) $(BUILD_LUA_CPPFLAGS) $(LDFLAGS) -fPIC -o $@ -c $<
+
+%.so:
+	$(CC) -shared -o $@ $^ $(LDFLAGS)
diff --git a/global/Makefile b/global/Makefile
index 616f1f2..c1b3aea 100644
--- a/global/Makefile
+++ b/global/Makefile
@@ -29,23 +29,18 @@ TOPLEVEL = ..
 
 include $(TOPLEVEL)/make.vars
 
-VPATH = .:$(TOPLEVEL)/generic:$(TOPLEVEL)
+#VPATH = .:$(TOPLEVEL)/generic:$(TOPLEVEL)
 
 SCRIPTS =
 GLOBALLUATOOLS = e2-create-project e2-fetch-project e2-install-e2
 GLOBALSHTOOLS = e2-locate-project-root e2-su
 GLOBALTOOLS = $(GLOBALLUATOOLS) $(GLOBALSHTOOLS)
 CLEAN_FILES = e2 e2.conf
-LUA_LIBS = strict.lua plugin.lua e2lib.lua
-LUA_LIBS += e2option.lua hash.lua tools.lua transport.lua cache.lua url.lua
-LUA_LIBS += generic_git.lua luafile.lua err.lua lock.lua
-LUA_LIBS += buildconfig.lua
 
 .PHONY: all install uninstall clean
 
 all: e2 $(SCRIPTS) \
-	$(GLOBALSHTOOLS:=.sh) e2.conf sha1.so e2-su-2.2 \
-	luafile_ll.so e2util.so
+	$(GLOBALSHTOOLS:=.sh) e2.conf e2-su-2.2 \
 
 install-dirs:
 	install -d $(DESTDIR)$(BINDIR)
@@ -57,10 +52,8 @@ install-dirs:
 	install -d $(DESTDIR)$(SYSCONFDIR)
 	install -d -m 2775 -g $(E2_GROUP) $(DESTDIR)$(LOCALSTATEDIR)
 
-install-lua: $(LUA_LIBS)
-	install -m 644 $^ $(DESTDIR)$(LIBDIR)
 
-install: all install-dirs install-lua
+install: all install-dirs
 	set -e; for i in $(GLOBALLUATOOLS) ; do \
 		install -m 755 $$i.lua $(DESTDIR)$(TOOLDIR)/$$i ; \
 		ln -sf e2 $(DESTDIR)$(BINDIR)/$$i ; \
@@ -73,9 +66,6 @@ install: all install-dirs install-lua
 		install -m 644 e2.conf $(DESTDIR)$(SYSCONFDIR)/e2.conf ; \
 	fi
 	install -m 644 e2.conf $(DESTDIR)$(SYSCONFDIR)/e2.conf.sample
-	install -m 755 sha1.so $(DESTDIR)$(LIBDIR)
-	install -m 755 luafile_ll.so $(DESTDIR)$(LIBDIR)
-	install -m 755 e2util.so $(DESTDIR)$(LIBDIR)
 	$(SUDO) install -m 4754 -o root -g $(E2_GROUP) e2-su-2.2 \
 		$(DESTDIR)$(BINDIR)/
 
@@ -88,10 +78,18 @@ uninstall:
 		rm -f $(DESTDIR)$(BINDIR)/$$i ; \
 	done
 	rm -f $(DESTDIR)$(BINDIR)/e2-su-2.2
-	rm -f $(DESTDIR)$(LIBDIR)/luafile_ll.so
-	rm -f $(DESTDIR)$(LIBDIR)/e2util.so
 	rm -f $(DESTDIR)$(BINDIR)/e2
 
+local:
+
+install-local:  e2-su-2.2.c
+	install -d $(LOCALMAKDIR)
+	install -m 644  e2-su-2.2.c  $(LOCALMAKDIR)
+
+uninstall-local:
+	rm -f $(LOCALMAKDIR)/e2-su-2.2.c
+	rmdir -p $(LOCALMAKDIR) || true
+
 doc:
 	set -e; for s in $(SUBDIRS) ; do \
 		$(MAKE) -C $$s $@ ;\
@@ -118,12 +116,6 @@ e2: e2.lua
 e2.conf: e2.conf.in
 	$(GENSCRIPT) $< $@
 
-sha1.so: sha1.o lsha1.o
-
-luafile_ll.so: luafile_ll.o
-
-e2util.so: e2util.o
-
 %.so:
 	$(CC) -shared -o $@ $^ $(LDFLAGS)
 
diff --git a/generic/e2-su-2.2.c b/global/e2-su-2.2.c
similarity index 100%
rename from generic/e2-su-2.2.c
rename to global/e2-su-2.2.c
diff --git a/local/Makefile b/local/Makefile
index b56922e..fbb3b51 100644
--- a/local/Makefile
+++ b/local/Makefile
@@ -32,63 +32,44 @@ TOPLEVEL = ..
 
 include $(TOPLEVEL)/make.vars
 
-VPATH = .:$(TOPLEVEL)/generic:$(TOPLEVEL)
-
 CLEAN_FILES = *~ *.so linux32 *.o
 CFLAGS += -I. -I$(DESTDIR)$(INCDIR) -I$(DESTDIR)$(INCDIR)/lua-$(LUA_VERSION) \
 	-I../lua/lua-$(LUA_VERSION)/src -fPIC
 LDFLAGS += -L. -L../lua/lua-$(LUA_VERSION)/src -Wl,-R$(LIBDIR)
 LOCALLUATOOLS = e2-build e2-dlist e2-dsort e2-fetch-sources \
-	e2-new-source e2-ls-project e2-playground \
-	e2-build-numbers e2-cf e2-help
-LOCALSHTOOLS =
-LUA_LIBS = e2option.lua luafile.lua generic_git.lua err.lua
-LUA_LIBS += e2tool.lua scm.lua digest.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 e2build.lua
-LUA_LIBS += e2lib.lua buildconfig.lua
-LOCALTOOLS = $(LOCALSHTOOLS) $(LOCALLUATOOLS)
-LOCALPLUGINS = cvs.lua files.lua git.lua svn.lua
+		e2-new-source e2-ls-project e2-playground \
+		e2-build-numbers e2-cf e2-help
 
-.PHONY: all install uninstall install install-local doc install-doc
+LOCALLUALIBS= digest.lua e2build.lua e2tool.lua environment.lua \
+	      policy.lua scm.lua
+LOCALTOOLS = $(LOCALLUATOOLS)
 
+.PHONY: all install uninstall local install-local doc install-doc
 
-all: linux32 sha1.so luafile_ll.so e2util.so
+all:
 
 install:
 	set -e; for i in $(LOCALTOOLS); do \
 		ln -sf e2 $(DESTDIR)$(BINDIR)/$$i ; \
 	done
 
-install-local-dirs:
-	mkdir -p $(LOCALBINDIR) $(LOCALMAKDIR) $(LOCALLIBDIR)
+linux32: linux32.c
 
-install-local-lua: $(LUA_LIBS)
-	install -m 644 $^ $(LOCALLIBDIR)
+local: linux32
 
-install-local: all install-local-dirs install-local-lua install-local-sourcefiles
-	test -n "$(PROJECTDIR)"
-	install -m 755 -d $(LOCALPLUGINDIR)
-	set -e; for p in $(LOCALPLUGINS) ; do \
-		install -m 644 $$p $(LOCALPLUGINDIR)/$$p; \
-	done
+install-local: local
+	install -d $(LOCALBINDIR)
+	install -d $(LOCALMAKDIR)
+	install -d $(LOCALLIBDIR)
+	install -m 644 $(LOCALLUALIBS) $(LOCALLIBDIR)
 	set -e; for i in $(LOCALLUATOOLS); do \
 		install -m 755 $$i.lua $(LOCALBINDIR)/$$i; \
 	done
-	set -e; for i in $(LOCALSHTOOLS); do \
-		install -m 755 $$i $(LOCALBINDIR)/$$i; \
-	done
 	install -m755 linux32 $(LOCALBINDIR)/e2-linux32; \
 	install -m644 linux32.c $(LOCALMAKDIR)/
 	ln -sf $(LIBEXECDIR)/e2-lua-$(LUA_VERSION) $(LOCALBINDIR)/e2-lua
 	$(MAKE) -C make install-local
-	install -m 755 sha1.so $(LOCALLIBDIR)
-	install -m 755 luafile_ll.so $(LOCALLIBDIR)
-	install -m 755 e2util.so $(LOCALLIBDIR)
 
-install-local-sourcefiles: e2-su-2.2.c
-	install -m 644 $^ $(LOCALMAKDIR)
 doc:
 	set -e; for s in $(SUBDIRS) ; do \
 		$(MAKE) -C $$s $@ ;\
@@ -106,17 +87,3 @@ uninstall:
 
 clean:
 	rm -f $(CLEAN_FILES)
-
-%: %.in
-	$(GENSCRIPT) $< $@
-
-linux32: linux32.c
-
-sha1.so: sha1.o lsha1.o
-
-luafile_ll.so: luafile_ll.o
-
-e2util.so: e2util.o
-
-%.so:
-	$(CC) -shared -o $@ $^ $(LDFLAGS)
diff --git a/lua/Makefile b/lua/Makefile
index 3ee7c07..6575440 100644
--- a/lua/Makefile
+++ b/lua/Makefile
@@ -44,9 +44,10 @@ lua-5.1.3:
 all: lua-5.1.3
 
 install: all
-	mkdir -p $(DESTDIR)$(INCDIR)/lua-5.1.3
+	install -d $(DESTDIR)$(LIBEXECDIR)
 	install -m755 lua-5.1.3/src/lua $(DESTDIR)$(LIBEXECDIR)/e2-lua-5.1.3
 	install -m755 lua-5.1.3/src/luac $(DESTDIR)$(LIBEXECDIR)/e2-luac-5.1.3
+	install -d $(DESTDIR)$(INCDIR)/lua-5.1.3
 	install -m644 lua-5.1.3/src/lua.h $(DESTDIR)$(INCDIR)/lua-5.1.3
 	install -m644 lua-5.1.3/src/lauxlib.h $(DESTDIR)$(INCDIR)/lua-5.1.3
 	install -m644 lua-5.1.3/src/lualib.h $(DESTDIR)$(INCDIR)/lua-5.1.3
@@ -55,21 +56,19 @@ install: all
 uninstall:
 	rm -f $(DESTDIR)$(LIBEXECDIR)/e2-lua-5.1.3
 	rm -f $(DESTDIR)$(LIBEXECDIR)/e2-luac-5.1.3
-	rm -fr $(DESTDIR)$(LIBEXECDIR)/lua-5.1.3
+	rmdir -p $(DESTDIR)$(LIBEXECDIR)/lua-5.1.3 || true
 	set -e; for x in $(LUA_HEADER) ; do \
 		rm -f $(DESTDIR)$(INCDIR)/lua-5.1.3/$$x ; \
 	done
-	rmdir -p $(DESTDIR)$(INCDIR)/lua-5.1.3 || :
+	rmdir -p $(DESTDIR)$(INCDIR)/lua-5.1.3 || true
+
+local:
+
+install-local:
 
 doc:
-	set -e; for s in $(SUBDIRS) ; do \
-		$(MAKE) -C $$s $@ ;\
-	done
 
 install-doc:
-	set -e; for s in $(SUBDIRS) ; do \
-		$(MAKE) -C $$s $@ ;\
-	done
 
 clean:
 	$(MAKE) -C lua-5.1.3/src clean
diff --git a/make.vars b/make.vars
index 307ec72..3c277bb 100644
--- a/make.vars
+++ b/make.vars
@@ -38,7 +38,6 @@ DEFAULT_LOCAL_TAG = $(TAG)
 DETECT_TOOL = $(TOPLEVEL)/scripts/detect_tool
 
 PROJECTDIR ?= $(shell cd $(TOPLEVEL) && $(BINDIR)/e2-locate-project-root 2>/dev/null)
-E2DATA = /mnt/e2data
 
 DESTDIR =
 PREFIX = /usr/local
@@ -66,10 +65,10 @@ LUA_ALL_VERSIONS  = 5.1.2 5.1.3
 LUA               = $(LIBEXECDIR)/e2-lua-$(LUA_VERSION)
 LUAC              = $(LIBEXECDIR)/e2-luac-$(LUA_VERSION)
 BUILD_LUAC        = $(TOPLEVEL)/lua/lua-$(LUA_VERSION)/src/luac
-BUILD_LUA_CPPFLAGS = -I $(TOPLEVEL)/lua/lua-$(LUA_VERSION)/src
+BUILD_LUA_CPPFLAGS = -I $(TOPLEVEL)/lua/lua-$(LUA_VERSION)/src \
+			-D_FILE_OFFSET_BITS=64
 LUA_CPPFLAGS      = -I $(INCDIR)/lua-$(LUA_VERSION) \
 			-D_FILE_OFFSET_BITS=64
-UPSTREAM          = $(E2DATA)/upstream
 BASE_PROJECT_PATH = $(E2DATA)/projects/emlix/emlix-base-project/proj/emlix-base-project.git
 BINARY_STORE      = $(E2DATA)/projects/emlix/e2/files
 LUA_SOURCE_PATH   ?= $(TOPLEVEL)
diff --git a/plugins/Makefile b/plugins/Makefile
new file mode 100644
index 0000000..601c138
--- /dev/null
+++ b/plugins/Makefile
@@ -0,0 +1,57 @@
+#
+#  e2factory, the emlix embedded build system
+#
+#  Copyright (C) 2007-2009 Gordon Hecker <gh@emlix.com>, emlix GmbH
+#  Copyright (C) 2007-2009 Oskar Schirmer <os@emlix.com>, emlix GmbH
+#  Copyright (C) 2007-2008 Felix Winkelmann, emlix GmbH
+#
+#  For more information have a look at http://www.e2factory.org
+#
+#  e2factory is a registered trademark by emlix GmbH.
+#
+#  This file is part of e2factory, the emlix embedded build system.
+#
+#  e2factory is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+TOPLEVEL = ..
+
+include $(TOPLEVEL)/make.vars
+
+SUBDIRS =
+CLEAN_FILES =
+LOCALPLUGINS = cvs.lua files.lua git.lua svn.lua
+
+.PHONY: all local install uninstall install install-local doc install-doc
+
+all:
+
+local:
+
+install:
+
+install-local:
+	install -m 755 -d $(LOCALPLUGINDIR)
+	set -e; for p in $(LOCALPLUGINS) ; do \
+		install -m 644 $$p $(LOCALPLUGINDIR)/$$p; \
+	done
+
+doc:
+
+install-doc:
+
+uninstall:
+
+clean:
+	rm -f $(CLEAN_FILES)
diff --git a/local/cvs.lua b/plugins/cvs.lua
similarity index 100%
rename from local/cvs.lua
rename to plugins/cvs.lua
diff --git a/local/files.lua b/plugins/files.lua
similarity index 100%
rename from local/files.lua
rename to plugins/files.lua
diff --git a/local/git.lua b/plugins/git.lua
similarity index 100%
rename from local/git.lua
rename to plugins/git.lua
diff --git a/local/svn.lua b/plugins/svn.lua
similarity index 100%
rename from local/svn.lua
rename to plugins/svn.lua
diff --git a/scripts/genscript.sh b/scripts/genscript.sh
index 43a0baf..bda30f9 100755
--- a/scripts/genscript.sh
+++ b/scripts/genscript.sh
@@ -12,7 +12,6 @@ test -n "$LIBDIR" || die "LIBDIR not set"
 test -n "$LIBEXECDIR" || die "LIBEXECDIR not set"
 test -n "$LOCALSTATEDIR" || die "LOCALSTATEDIR not set"
 test -n "$SYSCONFDIR" || die "SYSCONFDIR not set"
-test -n "$E2DATA" || die "E2DATA not set"
 test -n "$TOOLDIR" || die "TOOLDIR not set"
 test -n "$LUA_VERSION" || die "LUA_VERSION not set"
 test -n "$ARCH" || die "ARCH not set"
@@ -25,8 +24,7 @@ test -n "$CHOWN_TOOL" || die "CHOWN_TOOL not set"
 test -n "$RM_TOOL" || die "RM_TOOL not set"
 test -n "$DEFAULT_LOCAL_BRANCH" || die "DEFAULT_LOCAL_BRANCH not set"
 test -n "$DEFAULT_LOCAL_TAG" || die "DEFAULT_LOCAL_TAG not set"
-sed -e s,"@E2_E2DATA@","$E2DATA",g \
-    -e s,"@LIBDIR@","$LIBDIR",g \
+sed -e s,"@LIBDIR@","$LIBDIR",g \
     -e s,"@LIBEXECDIR@","$LIBEXECDIR",g \
     -e s,"@BINDIR@","$BINDIR",g \
     -e s,"@LOCALSTATEDIR@","$LOCALSTATEDIR",g \