add patch to fix remaining issue with DESTDIR so that the port uses

jftpgw's own install target.
This commit is contained in:
brad 2000-07-28 10:29:30 +00:00
parent 7fe9899540
commit 959b62bd19
2 changed files with 26 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2000/07/28 10:05:53 brad Exp $
# $OpenBSD: Makefile,v 1.4 2000/07/28 10:29:30 brad Exp $
DISTNAME= jftpgw-0.0.10b
CATEGORIES= net
@ -19,9 +19,8 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --enable-crypt \
--with-logpath="/var/log" --with-confpath="${SYSCONFDIR}"
do-install:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/jftpgw
${INSTALL_PROGRAM} ${WRKBUILD}/jftpgw ${PREFIX}/bin
${INSTALL_DATA} ${WRKBUILD}/jftpgw.conf.sample ${PREFIX}/lib/jftpgw
${INSTALL_DATA} ${WRKBUILD}/jftpgw.access.sample ${PREFIX}/lib/jftpgw

View File

@ -0,0 +1,24 @@
--- Makefile.in.orig Fri Jul 28 06:06:54 2000
+++ Makefile.in Fri Jul 28 06:17:36 2000
@@ -90,8 +90,6 @@
EXTRA_DIST = jftpgw.spec README jftpgw.access.sample.in jftpgw.conf.sample.in
-APPSDIR = /usr/local/bin
-
INCLUDES = @all_includes@
bin_PROGRAMS = jftpgw
@@ -525,9 +523,9 @@
# don't install a list of file. Just one file per install.
# if you have more of them, create a subdirectory with an extra Makefile
install-data-local:
- $(mkinstalldirs) @CONFPATH@
- $(INSTALL_DATA) jftpgw.conf.sample @CONFPATH@/jftpgw.conf
- $(INSTALL_DATA) jftpgw.access.sample @CONFPATH@/jftpgw.access
+ $(mkinstalldirs) $(DESTDIR)$(CONFPATH)
+ $(INSTALL_DATA) jftpgw.conf.sample $(DESTDIR)$(CONFPATH)/jftpgw.conf
+ $(INSTALL_DATA) jftpgw.access.sample $(DESTDIR)$(CONFPATH)/jftpgw.access
# remove ALL you have installed in install-data-local or install-exec-local
uninstall-local: