Make sure that SYSCONFDIR is expanded in pkg_install.conf(5).

4 files changed, 12 insertions, 3 deletions

diff --git a/pkgtools/pkg_install/files/configure b/pkgtools/pkg_install/files/configure
index 1d7091657cf..f5e58dd0561 100755
--- a/pkgtools/pkg_install/files/configure
+++ b/pkgtools/pkg_install/files/configure
@@ -639,6 +639,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+SYSCONFDIR
 EGREP
 CPP
 bootstrap
@@ -6847,7 +6848,10 @@ esac
 
 
 
-ac_config_files="$ac_config_files Makefile add/Makefile admin/Makefile bpm/bpm.sh create/Makefile delete/Makefile info/Makefile lib/Makefile"
+SYSCONFDIR="$sysconfdir"
+
+
+ac_config_files="$ac_config_files Makefile add/Makefile admin/Makefile bpm/bpm.sh create/Makefile delete/Makefile info/Makefile lib/Makefile lib/pkg_install.conf.5 lib/pkg_install.conf.cat5"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -7452,6 +7456,8 @@ do
     "delete/Makefile") CONFIG_FILES="$CONFIG_FILES delete/Makefile" ;;
     "info/Makefile") CONFIG_FILES="$CONFIG_FILES info/Makefile" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+    "lib/pkg_install.conf.5") CONFIG_FILES="$CONFIG_FILES lib/pkg_install.conf.5" ;;
+    "lib/pkg_install.conf.cat5") CONFIG_FILES="$CONFIG_FILES lib/pkg_install.conf.cat5" ;;
 
   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
diff --git a/pkgtools/pkg_install/files/configure.ac b/pkgtools/pkg_install/files/configure.ac
index 4001cce9e02..a2f7568656a 100644
--- a/pkgtools/pkg_install/files/configure.ac
+++ b/pkgtools/pkg_install/files/configure.ac
@@ -145,7 +145,10 @@ AH_BOTTOM(
 #endif
 )
 
+SYSCONFDIR="$sysconfdir"
+AC_SUBST(SYSCONFDIR)
+
 AC_CONFIG_FILES([Makefile add/Makefile admin/Makefile bpm/bpm.sh \
 	create/Makefile delete/Makefile info/Makefile \
-	lib/Makefile])
+	lib/Makefile lib/pkg_install.conf.5 lib/pkg_install.conf.cat5])
 AC_OUTPUT
diff --git a/pkgtools/pkg_install/files/lib/pkg_install.conf.5 b/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in
index 90f1afbf061..33f74007b5f 100644
--- a/pkgtools/pkg_install/files/lib/pkg_install.conf.5
+++ b/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkg_install.conf.5,v 1.3 2009/02/08 23:12:10 wiz Exp $
+.\"	$NetBSD: pkg_install.conf.5.in,v 1.1 2009/02/19 20:27:36 joerg Exp $
 .\"
 .\" Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/pkgtools/pkg_install/files/lib/pkg_install.conf.cat5 b/pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in
index 4afb1c61ba7..4afb1c61ba7 100644
--- a/pkgtools/pkg_install/files/lib/pkg_install.conf.cat5
+++ b/pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in