diff -ur vsftpd-2.0.1_org/Makefile vsftpd-2.0.1_patch/Makefile --- vsftpd-2.0.1_org/Makefile 2004-06-06 18:21:27.000000000 +0200 +++ vsftpd-2.0.1_patch/Makefile 2004-07-21 09:50:25.245576352 +0200 @@ -5,7 +5,7 @@ #CFLAGS = -g CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion -LIBS = `./vsf_findlibs.sh` +LIBS = -lssl -lcrypto -lnsl -lresolv LINK = -Wl,-s OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ @@ -24,21 +24,21 @@ $(CC) -o vsftpd $(OBJS) $(LINK) $(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