From aad3f2043a90f3065d9a17a580400ee1fd173376 Mon Sep 17 00:00:00 2001 From: Gordon Hecker Date: Wed, 22 Apr 2009 17:22:28 +0200 Subject: [PATCH] support DESTDIR when installing global tools Signed-off-by: Gordon Hecker --- global/Makefile | 10 +++++----- templates/Makefile | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/global/Makefile b/global/Makefile index 5882f98..ee7f339 100644 --- 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 560e4c7..8665be3 100644 --- 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 -- 2.39.5