From bab3f62f1fd5b7c2ab197f4311ad191bf18816b9 Mon Sep 17 00:00:00 2001
|
From: Paul Eggleton <paul.eggleton@linux.intel.com>
|
Date: Mon, 20 Feb 2012 13:51:49 +0000
|
Subject: [PATCH] Use DESTDIR within install to allow installing under a prefix
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
|
---
|
Makefile | 26 +++++++++++++-------------
|
1 file changed, 13 insertions(+), 13 deletions(-)
|
|
diff --git a/Makefile b/Makefile
|
index c63ed1b..9e4f35f 100644
|
--- a/Makefile
|
+++ b/Makefile
|
@@ -29,21 +29,21 @@ vsftpd: $(OBJS)
|
$(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
|
|
install:
|
- if [ -x /usr/local/sbin ]; then \
|
- $(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \
|
+ if [ -x ${DESTDIR}/usr/local/sbin ]; then \
|
+ $(INSTALL) -m 755 vsftpd ${DESTDIR}/usr/local/sbin/vsftpd; \
|
else \
|
- $(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; fi
|
- if [ -x /usr/local/man ]; then \
|
- $(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \
|
- $(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \
|
- elif [ -x /usr/share/man ]; then \
|
- $(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \
|
- $(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \
|
+ $(INSTALL) -m 755 vsftpd ${DESTDIR}/usr/sbin/vsftpd; fi
|
+ if [ -x ${DESTDIR}/usr/local/man ]; then \
|
+ $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/local/man/man8/vsftpd.8; \
|
+ $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/local/man/man5/vsftpd.conf.5; \
|
+ elif [ -x ${DESTDIR}/usr/share/man ]; then \
|
+ $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/share/man/man8/vsftpd.8; \
|
+ $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/share/man/man5/vsftpd.conf.5; \
|
else \
|
- $(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; \
|
- $(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; fi
|
- if [ -x /etc/xinetd.d ]; then \
|
- $(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi
|
+ $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/man/man8/vsftpd.8; \
|
+ $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/man/man5/vsftpd.conf.5; fi
|
+ if [ -x ${DESTDIR}/etc/xinetd.d ]; then \
|
+ $(INSTALL) -m 644 xinetd.d/vsftpd ${DESTDIR}/etc/xinetd.d/vsftpd; fi
|
|
clean:
|
rm -f *.o *.swp vsftpd
|
