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 /databases | |
| 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 'databases')
| -rw-r--r-- | databases/postgresql-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/postgresql-server/pkg/INSTALL | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile index fd9f6d4a00a..b635f59b6b4 100644 --- a/databases/postgresql-server/Makefile +++ b/databases/postgresql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/06/23 19:26:52 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/08/14 03:41:38 jlam Exp $ .include "../../databases/postgresql/Makefile.common" .include "../../databases/postgresql/Makefile.ssl" @@ -54,7 +54,7 @@ FILES_SUBST+= ADDGROUP=${ADDGROUP:Q} FILES_SUBST+= CAT=${CAT:Q} FILES_SUBST+= CHGRP=${CHGRP:Q} FILES_SUBST+= CHOWN=${CHOWN:Q} -FILES_SUBST+= GREP=${GREP:Q} +FILES_SUBST+= ID=${ID:Q} FILES_SUBST+= MKDIR=${MKDIR:Q} FILES_SUBST+= RM=${RM:Q} FILES_SUBST+= SU=${SU:Q} diff --git a/databases/postgresql-server/pkg/INSTALL b/databases/postgresql-server/pkg/INSTALL index 8762131b5f2..3772ed4c54e 100644 --- a/databases/postgresql-server/pkg/INSTALL +++ b/databases/postgresql-server/pkg/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.4 2001/08/12 19:55:56 veego Exp $ +# $NetBSD: INSTALL,v 1.5 2001/08/14 03:41:38 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -13,7 +13,7 @@ ADDUSER="@ADDUSER@" ADDGROUP="@ADDGROUP@" CHGRP="@CHGRP@" CHOWN="@CHOWN@" -GREP="@GREP@" +ID="@ID@" MKDIR="@MKDIR@" RM="@RM@" SU="@SU@" @@ -39,7 +39,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." |