diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-14 03:41:37 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-14 03:41:37 +0000 |
| commit | e085ee5316bc26e385bb335fa2dfa61551ff2589 (patch) | |
| tree | be92c5758d72a625f5cd1f8562ab245b28dc9940 /print | |
| parent | 1bea6ca246eeb383e553bc08fcd6672560ab8db7 (diff) | |
| download | pkgsrc-e085ee5316bc26e385bb335fa2dfa61551ff2589.tar.gz | |
grep isn't used anymore, so don't substitute for @GREP@ in the INSTALL
files. Substitute for @ID@ instead of directly using 'id', and use the
value of ${ID} already set in defs.*.mk.
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups/Makefile | 4 | ||||
| -rw-r--r-- | print/cups/pkg/INSTALL | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index 157e5aad283..1d114b0cd16 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2001/08/02 03:37:39 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2001/08/14 03:41:38 jlam Exp $ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${VERS} @@ -85,7 +85,7 @@ FILES_SUBST+= CHMOD=${CHMOD:Q} FILES_SUBST+= CHOWN=${CHOWN:Q} FILES_SUBST+= CMP=${CMP:Q} FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= GREP=${GREP:Q} +FILES_SUBST+= ID=${ID:Q} FILES_SUBST+= MKDIR=${MKDIR:Q} FILES_SUBST+= RM=${RM:Q} FILES_SUBST+= RMDIR=${RMDIR:Q} diff --git a/print/cups/pkg/INSTALL b/print/cups/pkg/INSTALL index b7cc673ed55..46378126ebb 100644 --- a/print/cups/pkg/INSTALL +++ b/print/cups/pkg/INSTALL @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: INSTALL,v 1.10 2001/08/12 19:55:56 veego Exp $ +# $NetBSD: INSTALL,v 1.11 2001/08/14 03:41:39 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -15,7 +15,7 @@ CHGRP="@CHGRP@" CHMOD="@CHMOD@" CHOWN="@CHOWN@" CP="@CP@" -GREP="@GREP@" +ID="@ID@" MKDIR="@MKDIR@" RM="@RM@" TOUCH="@TOUCH@" @@ -47,7 +47,7 @@ PRE-INSTALL) # Use `id' to be able to use NIS. # - id ${USER} 2>/dev/null >/dev/null + ${ID} ${USER} 2>/dev/null >/dev/null if [ $? -eq 0 ] then echo "User '${USER}' already exists...proceeding." |