summaryrefslogtreecommitdiff
path: root/news
diff options
context:
space:
mode:
Diffstat (limited to 'news')
-rw-r--r--news/inn/Makefile5
-rw-r--r--news/inn/pkg/INSTALL4
2 files changed, 4 insertions, 5 deletions
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 744020ec6ca..8db4eccad5f 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/02/25 04:18:10 hubertf Exp $
+# $NetBSD: Makefile,v 1.26 2001/03/01 19:07:53 jlam Exp $
DISTNAME= inn-2.3.1
CATEGORIES= news
@@ -57,7 +57,6 @@ post-build:
${FILESDIR}/innd.sh >${WRKDIR}/innd.sh
.for FILE in DEINSTALL INSTALL
${SED} -e 's#@@INN_DATA_DIR@@#${INN_DATA_DIR}#g' \
- -e 's#@@PREFIX@@#${PREFIX}#g' \
${PKGDIR}/${FILE} >${WRKDIR}/${FILE}
.endfor
for DIR in backends expire frontends innd innfeed lib nnrpd \
@@ -82,6 +81,6 @@ post-install:
done
cd ${WRKSRC}/site && \
${INSTALL_SCRIPT} ${WRKDIR}/innd.sh ${PREFIX}/etc/rc.d/innd
- @${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+ PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
.include "../../mk/bsd.pkg.mk"
diff --git a/news/inn/pkg/INSTALL b/news/inn/pkg/INSTALL
index 5c7257beb73..774a791d7e2 100644
--- a/news/inn/pkg/INSTALL
+++ b/news/inn/pkg/INSTALL
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: INSTALL,v 1.3 2001/02/08 16:23:07 tron Exp $
+# $NetBSD: INSTALL,v 1.4 2001/03/01 19:07:53 jlam Exp $
if [ "$2" != "POST-INSTALL" ]; then
exit 0
@@ -30,7 +30,7 @@ ETC="actsync.cfg actsync.ign buffindexed.conf control.ctl cycbuff.conf distrib.p
for FILE in $ETC; do
if [ ! -f @@INN_DATA_DIR@@/etc/$FILE ]; then
- install -c -o news -g news -m 664 @@PREFIX@@/share/examples/inn/$FILE @@INN_DATA_DIR@@/etc
+ install -c -o news -g news -m 664 ${PKG_PREIX}/share/examples/inn/$FILE @@INN_DATA_DIR@@/etc
fi
done