1From bab3f62f1fd5b7c2ab197f4311ad191bf18816b9 Mon Sep 17 00:00:00 2001 2From: Paul Eggleton <paul.eggleton@linux.intel.com> 3Date: Mon, 20 Feb 2012 13:51:49 +0000 4Subject: [PATCH] Use DESTDIR within install to allow installing under a prefix 5 6Upstream-Status: Pending 7 8Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 9 10--- 11 Makefile | 26 +++++++++++++------------- 12 1 file changed, 13 insertions(+), 13 deletions(-) 13 14diff --git a/Makefile b/Makefile 15index c63ed1b..9e4f35f 100644 16--- a/Makefile 17+++ b/Makefile 18@@ -29,21 +29,21 @@ vsftpd: $(OBJS) 19 $(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS) 20 21 install: 22- if [ -x /usr/local/sbin ]; then \ 23- $(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \ 24+ if [ -x ${DESTDIR}/usr/local/sbin ]; then \ 25+ $(INSTALL) -m 755 vsftpd ${DESTDIR}/usr/local/sbin/vsftpd; \ 26 else \ 27- $(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; fi 28- if [ -x /usr/local/man ]; then \ 29- $(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \ 30- $(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \ 31- elif [ -x /usr/share/man ]; then \ 32- $(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \ 33- $(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \ 34+ $(INSTALL) -m 755 vsftpd ${DESTDIR}/usr/sbin/vsftpd; fi 35+ if [ -x ${DESTDIR}/usr/local/man ]; then \ 36+ $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/local/man/man8/vsftpd.8; \ 37+ $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/local/man/man5/vsftpd.conf.5; \ 38+ elif [ -x ${DESTDIR}/usr/share/man ]; then \ 39+ $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/share/man/man8/vsftpd.8; \ 40+ $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/share/man/man5/vsftpd.conf.5; \ 41 else \ 42- $(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; \ 43- $(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; fi 44- if [ -x /etc/xinetd.d ]; then \ 45- $(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi 46+ $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/man/man8/vsftpd.8; \ 47+ $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/man/man5/vsftpd.conf.5; fi 48+ if [ -x ${DESTDIR}/etc/xinetd.d ]; then \ 49+ $(INSTALL) -m 644 xinetd.d/vsftpd ${DESTDIR}/etc/xinetd.d/vsftpd; fi 50 51 clean: 52 rm -f *.o *.swp vsftpd 53