Merge remote-tracking branch 'oe21/master' into vuplus-3.0
[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-daemon / vsftpd / vsftpd-3.0.2 / makefile-destdir.patch
1 Use DESTDIR within install to allow installing under a prefix
2
3 Upstream-Status: Pending
4
5 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
6
7 diff --git a/Makefile b/Makefile
8 --- a/Makefile
9 +++ b/Makefile
10 @@ -24,21 +24,21 @@
11         $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS)
12  
13  install:
14 -       if [ -x /usr/local/sbin ]; then \
15 -               $(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \
16 +       if [ -x ${DESTDIR}/usr/local/sbin ]; then \
17 +               $(INSTALL) -m 755 vsftpd ${DESTDIR}/usr/local/sbin/vsftpd; \
18         else \
19 -               $(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; fi
20 -       if [ -x /usr/local/man ]; then \
21 -               $(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \
22 -               $(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \
23 -       elif [ -x /usr/share/man ]; then \
24 -               $(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \
25 -               $(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \
26 +               $(INSTALL) -m 755 vsftpd ${DESTDIR}/usr/sbin/vsftpd; fi
27 +       if [ -x ${DESTDIR}/usr/local/man ]; then \
28 +               $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/local/man/man8/vsftpd.8; \
29 +               $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/local/man/man5/vsftpd.conf.5; \
30 +       elif [ -x ${DESTDIR}/usr/share/man ]; then \
31 +               $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/share/man/man8/vsftpd.8; \
32 +               $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/share/man/man5/vsftpd.conf.5; \
33         else \
34 -               $(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; \
35 -               $(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; fi
36 -       if [ -x /etc/xinetd.d ]; then \
37 -               $(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi
38 +               $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/man/man8/vsftpd.8; \
39 +               $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/man/man5/vsftpd.conf.5; fi
40 +       if [ -x ${DESTDIR}/etc/xinetd.d ]; then \
41 +               $(INSTALL) -m 644 xinetd.d/vsftpd ${DESTDIR}/etc/xinetd.d/vsftpd; fi
42  
43  clean:
44         rm -f *.o *.swp vsftpd