summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2000-12-11 19:19:42 +0000
committerjlam <jlam>2000-12-11 19:19:42 +0000
commitb07fde8117ec2d12f2d61a5a705382babe70662e (patch)
tree79f105b7d4966af5d8e4f7c0689e1901dcaebe1f
parent6258c067c2a62585bb177f4b13024e0aecc3d026 (diff)
downloadpkgsrc-b07fde8117ec2d12f2d61a5a705382babe70662e.tar.gz
It's unnecessary to substitute for @PREFIX@ in a DEINSTALL/INSTALL script
as ${PKG_PREFIX} always contains that value.
-rw-r--r--databases/openldap/Makefile4
-rw-r--r--databases/openldap/pkg/DEINSTALL4
2 files changed, 3 insertions, 5 deletions
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 8759ac1cfe3..01e294aa01f 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/08/14 16:35:31 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2000/12/11 19:19:42 jlam Exp $
#
DISTNAME= openldap-1.2.11
@@ -16,7 +16,6 @@ CONFLICTS+= ldapsdk*
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/build/ltconfig
-DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
.include "../../mk/bsd.prefs.mk"
@@ -37,7 +36,6 @@ PLIST_SRC= ${WRKDIR}/.PLIST_SRC
post-build:
${CAT} ${PKGDIR}/PLIST.common ${PKGDIR}/PLIST.${LOWER_OPSYS} > ${PLIST_SRC}
- ${SED} "s,@PREFIX@,${PREFIX}," ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
post-configure:
${ECHO} "SLAPD_LIBS = " >> ${WRKSRC}/servers/slapd/tools/Makefile
diff --git a/databases/openldap/pkg/DEINSTALL b/databases/openldap/pkg/DEINSTALL
index acea5a0e59c..3b244d39951 100644
--- a/databases/openldap/pkg/DEINSTALL
+++ b/databases/openldap/pkg/DEINSTALL
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $NetBSD: DEINSTALL,v 1.1 2000/08/14 16:35:32 wiz Exp $
+# $NetBSD: DEINSTALL,v 1.2 2000/12/11 19:19:42 jlam Exp $
#
case $2 in
DEINSTALL) cat << EOF
===========================================================================
-If you don't want to use openldap anymore, remove @PREFIX@/etc/openldap.
+If you don't want to use openldap anymore, remove ${PKG_PREFIX}/etc/openldap.
===========================================================================
EOF