Substitute for various program paths used by the linkfarm(1) and

pkg_view(1) shell scripts.

2 files changed, 34 insertions, 26 deletions

diff --git a/pkgtools/pkg_install/files/view/linkfarm.sh b/pkgtools/pkg_install/files/view/linkfarm.sh.in
index c6df11ce7d7..5c934139846 100644
--- a/pkgtools/pkg_install/files/view/linkfarm.sh
+++ b/pkgtools/pkg_install/files/view/linkfarm.sh.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: linkfarm.sh,v 1.1 2003/09/01 16:27:16 jlam Exp $
+# $NetBSD: linkfarm.sh.in,v 1.1 2003/09/08 04:49:07 jlam Exp $
 
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
@@ -34,16 +34,20 @@
 
 # set -x
 
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+sbindir="@sbindir@"
+
 # set up program definitions
-findprog=/usr/bin/find
-grepprog=/usr/bin/grep
-lnprog=/bin/ln
-mkdirprog=/bin/mkdir
-pkginfoprog=/usr/sbin/pkg_info
-rmprog=/bin/rm
-rmdirprog=/bin/rmdir
-sedprog=/usr/bin/sed
-sortprog=/usr/bin/sort
+findprog="@FIND@"
+grepprog="@GREP@"
+lnprog="@LN@"
+mkdirprog="@MKDIR@"
+pkginfoprog="@sbindir@/pkg_info"
+rmprog="@RM@"
+rmdirprog="@RMDIR@"
+sedprog="@SED@"
+sortprog="@SORT@"
 
 usage() {
 	echo 'Usage: linkfarm [options] package'
diff --git a/pkgtools/pkg_install/files/view/pkg_view.sh b/pkgtools/pkg_install/files/view/pkg_view.sh.in
index ad4d91e1245..447c27813e4 100644
--- a/pkgtools/pkg_install/files/view/pkg_view.sh
+++ b/pkgtools/pkg_install/files/view/pkg_view.sh.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: pkg_view.sh,v 1.2 2003/09/03 14:06:01 jlam Exp $
+# $NetBSD: pkg_view.sh.in,v 1.1 2003/09/08 04:49:07 jlam Exp $
 
 #
 # Copyright (c) 2001 Alistair G. Crooks.  All rights reserved.
@@ -34,22 +34,26 @@
 
 # set -x
 
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+sbindir="@sbindir@"
+
 # set up program definitions
-chmodprog=/bin/chmod
-cmpprog=/usr/bin/cmp
-cpprog=/bin/cp
-envprog=/usr/bin/env
-findprog=/usr/bin/find
-grepprog=/usr/bin/grep
-linkfarmprog=/usr/sbin/linkfarm
-lnprog=/bin/ln
-mkdirprog=/bin/mkdir
-paxprog=/bin/pax
-pkginfoprog=/usr/sbin/pkg_info
-rmprog=/bin/rm
-rmdirprog=/bin/rmdir
-sedprog=/usr/bin/sed
-touchprog=/usr/bin/touch
+chmodprog="@CHMOD@"
+cmpprog="@CMP@"
+cpprog="@CP@"
+envprog="@ENV@"
+findprog="@FIND@"
+grepprog="@GREP@"
+linkfarmprog="@sbindir@/linkfarm"
+lnprog="@LN@"
+mkdirprog="@MKDIR@"
+paxprog="@PAX@"
+pkginfoprog="@sbindir@/pkg_info"
+rmprog="@RM@"
+rmdirprog="@RMDIR@"
+sedprog="@SED@"
+touchprog="@TOUCH@"
 
 usage() {
 	echo 'Usage: pkg_view [-n] [-v] [-i ignore] [-k pkg_dbdir_dflt] [-w viewname] [-d stowdir] [-W viewbase] add|check|delete pkgname...'