diff options
author | jlam <jlam> | 2001-11-25 19:38:55 +0000 |
---|---|---|
committer | jlam <jlam> | 2001-11-25 19:38:55 +0000 |
commit | c9113cc6649be6ae4e40c53ffd97aba7a319b145 (patch) | |
tree | 3d355793e74fdd81d3ba7a12fb0f5d5715671a0a /mk | |
parent | 6e0a299ac8ad30c7eac91b989fb2a23be43a1fd3 (diff) | |
download | pkgsrc-c9113cc6649be6ae4e40c53ffd97aba7a319b145.tar.gz |
Check for an empty value for PKG_SYSCONFSUBDIR and set PKG_SYSCONFDIR
accordingly so that config files are in /usr/pkg/etc/foo.conf, and not
/usr/pkg/etc//foo.conf.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index ad3b55ad6c8..53cd14284cf 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.861 2001/11/25 19:04:19 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.862 2001/11/25 19:38:55 jlam Exp $ # # This file is in the public domain. # @@ -71,7 +71,11 @@ PKG_SYSCONFDIR= ${PKG_SYSCONFDIR.${PKGBASE}} .else PKG_SYSCONFSUBDIR?= # empty PKG_SYSCONFBASE?= ${PREFIX}/etc +. if empty(PKG_SYSCONFSUBDIR) +PKG_SYSCONFDIR?= ${PKG_SYSCONFBASE} +. else PKG_SYSCONFDIR?= ${PKG_SYSCONFBASE}/${PKG_SYSCONFSUBDIR} +. endif .endif CONFIGURE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}" |