diff options
| author | jlam <jlam@pkgsrc.org> | 2003-09-05 11:34:25 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-09-05 11:34:25 +0000 |
| commit | 3ec69455ab912e20e399d64794487c709476eb8b (patch) | |
| tree | 44709d065bffeb4880702cf53263d326c5eb8ddf /mk/install/deinstall | |
| parent | db2615f02dac7fda5aeda9b1fc7d6f54bbf45892 (diff) | |
| download | pkgsrc-3ec69455ab912e20e399d64794487c709476eb8b.tar.gz | |
Package Makefiles should refer to PKG_SYSCONFBASEDIR instead of
PKG_SYSCONFBASE when they want PKG_SYSCONFDIR stripped of
PKG_SYSCONFSUBDIR. This makes PKG_SYSCONFBASE=/etc work with pkgviews by
installing all config files into /etc/packages/<pkg> instead of
occasionally putting some directly into /etc.
Also only create PKG_SYSCONFDIR if we're actually going to copy config
files.
Diffstat (limited to 'mk/install/deinstall')
| -rw-r--r-- | mk/install/deinstall | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/install/deinstall b/mk/install/deinstall index 470c5ffc811..90d2ee3afda 100644 --- a/mk/install/deinstall +++ b/mk/install/deinstall @@ -1,6 +1,6 @@ # start of deinstall # -# $NetBSD: deinstall,v 1.18 2003/09/02 07:00:06 jlam Exp $ +# $NetBSD: deinstall,v 1.19 2003/09/05 11:34:27 jlam Exp $ eval set -- ${PKG_USERS} for userset; do @@ -45,7 +45,7 @@ while [ $# -gt 0 ]; do VIEW_FILES="${VIEW_FILES} \"${file}\"" done -eval set -- ${RCD_SCRIPTS_DIR} ${MAKE_DIRS} +eval set -- ${PKG_SYSCONFDIR} ${RCD_SCRIPTS_DIR} ${MAKE_DIRS} for dir; do ALL_MAKE_DIRS="${ALL_MAKE_DIRS} \"${dir}\"" done @@ -171,7 +171,7 @@ POST-DEINSTALL) # Don't bother the admin about the following dirs # if they still exist. # - ${PKG_SYSCONFBASE}|${RCD_SCRIPTS_DIR}) + ${PKG_SYSCONFBASEDIR}|${RCD_SCRIPTS_DIR}) ;; *) if [ -d "${dir}" ]; then |