Remove redundant SUBST_* from package Makefile

OK'ed joerg@

2 files changed, 9 insertions, 23 deletions

diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index 1a26fae8aa7..190b0fe6e07 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.134 2007/07/25 15:01:45 joerg Exp $
+# $NetBSD: Makefile,v 1.135 2007/07/29 14:06:44 adrianp Exp $
 
 # Notes to package maintainers:
 #
@@ -77,23 +77,14 @@ MESSAGE_SUBST+=		PKGVULNDIR=${PKG_DBDIR:Q}			\
 VERSION!=		${AWK} -F '"' '/PKGTOOLS_VERSION/ {print $$2}' \
 			${FILESDIR}/lib/version.h
 
-# Make sure download-vulnerability-list.sh picks up the right tools
-# in the right directories.
+# Make sure the audit-packages files pick up the right tools in the right
+# places.
 #
 SUBST_CLASSES=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_MESSAGE.paths=	Fixing paths in scripts.
-SUBST_FILES.paths=	audit-packages/download-vulnerability-list.sh.in
-SUBST_FILES.paths+=	audit-packages/audit-packages.1.in
-SUBST_FILES.paths+=	audit-packages/audit-packages.cat1.in
-SUBST_FILES.paths+=	audit-packages/audit-packages.conf.5.in
-SUBST_FILES.paths+=	audit-packages/audit-packages.conf.cat5.in
-SUBST_FILES.paths+=	audit-packages/audit-packages.conf.in
-SUBST_FILES.paths+=	audit-packages/download-vulnerability-list.1.in
-SUBST_FILES.paths+=	audit-packages/download-vulnerability-list.cat1.in
-SUBST_SED.paths=	-e 's,@gzcat@,${GZCAT},g'
-SUBST_SED.paths+=	-e 's,@sysconfdir@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@prefix@/bin/gpg,${PREFIX}/bin/gpg,g'
+SUBST_FILES.paths=	audit-packages/Makefile.in
+SUBST_SED.paths=	-e 's,_gzcat_,${GZCAT},g'
 
 do-extract:
 	@${CP} -R ${FILESDIR} ${WRKSRC}
diff --git a/pkgtools/pkg_install/files/audit-packages/Makefile.in b/pkgtools/pkg_install/files/audit-packages/Makefile.in
index 09cb788bf85..db7a39931b8 100644
--- a/pkgtools/pkg_install/files/audit-packages/Makefile.in
+++ b/pkgtools/pkg_install/files/audit-packages/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.2 2007/07/16 09:57:57 joerg Exp $
+# $NetBSD: Makefile.in,v 1.3 2007/07/29 14:06:44 adrianp Exp $
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -15,12 +15,7 @@ cat5dir = $(mandir)/cat5
 cat1dir = $(mandir)/cat1
 sharedir = $(prefix)/share/examples/pkg_install
 
-do_subst = 	sed -e 's,_pkgdbdir_,$(pkgdbdir),g' \
-		-e 's,_sysconfdir_,$(sysconfdir),g' \
-		-e 's,_prefix_,$(prefix),g' \
-		-e 's,_pprefix_,$(pprefix),g' \
-		-e 's,_ftp_,@ftp@,g' \
-		-e 's,_gzcat_,@gzcat@,g'
+do_subst = 	sed -e 's,@gzcat@,_gzcat_,g'
 
 CC = @CC@
 CCLD= $(CC)
@@ -30,7 +25,7 @@ CPPFLAGS+=	-DPREFIX=\"$(prefix)\" -DSYSCONFDIR=\"$(sysconfdir)\"
 DEFS= @DEFS@
 CFLAGS= @CFLAGS@ -Wall
 LDFLAGS= @LDFLAGS@ -L../lib
-SUBST_FILES= audit-packages.1 download-vulnerability-list.1 audit-packages.conf audit-packages.conf.5 audit-packages.conf.cat5
+SUBST_FILES= audit-packages.conf.5 audit-packages.conf.cat5 audit-packages.conf download-vulnerability-list.sh
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -46,7 +41,7 @@ audit-packages_OBJS = audit-packages.o
 .c.o:
 	$(COMPILE) -c $< -o $@
 
-all: audit-packages
+all: subst audit-packages
 
 audit-packages: $(audit-packages_OBJS)
 	$(LINK) $(audit-packages_OBJS) $(LIBS)