From 0ee94211e95096750ede752acd13b163aa6d5046 Mon Sep 17 00:00:00 2001 From: Benedikt Morbach Date: Tue, 20 May 2014 23:30:53 +0200 Subject: don't include FAKEROOT in Makefile variables instead, prepend it when actually using them. This makes the variables more useful for specifying on the make invocation, as you don't have to repeat your FAKEROOT/DESTDIR for every variable you want to set. Just like you can set 'lib' without specifying lib_prefix. compare: make DESTDIR="${somevar}" prefix=/usr/local LIBDIR="${somevar}"/usr/local/lib96 MANDIR="${somevar}"/usr/share/man to: make DESTDIR="${somevar}" prefix=/usr/local LIBDIR=/usr/local/lib96 MANDIR=/usr/share/man Signed-off-by: Andrew G Morgan --- progs/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'progs') diff --git a/progs/Makefile b/progs/Makefile index ef51dc6..778149e 100644 --- a/progs/Makefile +++ b/progs/Makefile @@ -25,12 +25,12 @@ $(BUILD): %: %.o $(CC) $(IPATH) $(CFLAGS) -c $< -o $@ install: all - mkdir -p -m 0755 $(SBINDIR) + mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) for p in $(PROGS) ; do \ - install -m 0755 $$p $(SBINDIR) ; \ + install -m 0755 $$p $(FAKEROOT)$(SBINDIR) ; \ done ifeq ($(RAISE_SETFCAP),yes) - $(SBINDIR)/setcap cap_setfcap=i $(SBINDIR)/setcap + $(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap endif clean: -- cgit v1.2.3