support DESTDIR when installing global tools

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

diff --git a/global/Makefile b/global/Makefile
index 5882f989cb9f25d467ba7e2b9b25f12bc4fb8c4d..ee7f339cf4118d0db76073014a9d6a0dd82abf18 100644 (file)
--- a/global/Makefile
+++ b/global/Makefile
@@ -53,12 +53,12 @@ install: all
        install -m 4754 -o root -g $(E2_GROUP) e2-su $(DESTDIR)$(BINDIR)/
        install -m 755 e2 $(DESTDIR)$(BINDIR)/
        install -m 644 e2global.lc $(DESTDIR)$(LIBDIR)/
-       install -d $(SYSCONFDIR)
-       if [ ! -f "$(SYSCONFDIR)/e2.conf" ] ; then \
-               install -m 644 e2.conf $(SYSCONFDIR)/e2.conf ; \
+       install -d $(DESTDIR)$(SYSCONFDIR)
+       if [ ! -f "$(DESTDIR)$(SYSCONFDIR)/e2.conf" ] ; then \
+               install -m 644 e2.conf $(DESTDIR)$(SYSCONFDIR)/e2.conf ; \
        fi
-       install -m 644 e2.conf $(SYSCONFDIR)/e2.conf.sample
-       install -d -m 2775 -g $(E2_GROUP) $(LOCALSTATEDIR)
+       install -m 644 e2.conf $(DESTDIR)$(SYSCONFDIR)/e2.conf.sample
+       install -d -m 2775 -g $(E2_GROUP) $(DESTDIR)$(LOCALSTATEDIR)
 
 uninstall:
        for i in $(GLOBALLUATOOLS) ; do \

diff --git a/templates/Makefile b/templates/Makefile
index 560e4c7ebabdf4cbdba09d4147bfafbf4e5be109..8665be33b75db7265dcefd17a9467dde0221536b 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -38,12 +38,12 @@ all:
 clean:
 
 install: all
-       install -m 755 -d /etc/e2/templates/proj
-       install -m 644 proj/config /etc/e2/templates/proj/config
-       install -m 644 proj/chroot /etc/e2/templates/proj/chroot
-       install -m 644 proj/licences /etc/e2/templates/proj/licences
-       install -m 644 proj/env    /etc/e2/templates/proj/env
-       install -m 644 gitignore   /etc/e2/templates/gitignore
+       install -m 755 -d $(DESTDIR)/etc/e2/templates/proj
+       install -m 644 proj/config $(DESTDIR)/etc/e2/templates/proj/config
+       install -m 644 proj/chroot $(DESTDIR)/etc/e2/templates/proj/chroot
+       install -m 644 proj/licences $(DESTDIR)/etc/e2/templates/proj/licences
+       install -m 644 proj/env    $(DESTDIR)/etc/e2/templates/proj/env
+       install -m 644 gitignore   $(DESTDIR)/etc/e2/templates/gitignore
 
 install-local: all
        install -m 755 -d $(LOCALLIBDIR)/templates