diff options
| author | Masafumi Max NAKANE <max@FreeBSD.org> | 1999-04-16 17:45:02 +0000 |
|---|---|---|
| committer | Masafumi Max NAKANE <max@FreeBSD.org> | 1999-04-16 17:45:02 +0000 |
| commit | 4d5c7062709dff0e886fb3bcc3b6328e9bbc6b8d (patch) | |
| tree | f61ddfea49638f199f9d8f4abaadd5ecc083892c | |
| parent | Upgrade to 6.4.2. (diff) | |
Pass PKGNAME as well to the INSTALL script.
Notes
Notes:
svn path=/head/; revision=17930
| -rw-r--r-- | japanese/postgresql-tcltk/Makefile | 4 | ||||
| -rw-r--r-- | japanese/postgresql-tcltk/pkg-install | 4 | ||||
| -rw-r--r-- | japanese/postgresql/Makefile | 4 | ||||
| -rw-r--r-- | japanese/postgresql/pkg-install | 4 | ||||
| -rw-r--r-- | japanese/postgresql7/Makefile | 4 | ||||
| -rw-r--r-- | japanese/postgresql7/pkg-install | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/japanese/postgresql-tcltk/Makefile b/japanese/postgresql-tcltk/Makefile index 495ff374464c..f8c17dce66bc 100644 --- a/japanese/postgresql-tcltk/Makefile +++ b/japanese/postgresql-tcltk/Makefile @@ -3,7 +3,7 @@ # Date created: 25 Nov 1998 # Whom: Ichiro Fukuhara <ichiro@ichiro.org> # -# $Id: Makefile,v 1.4 1999/01/01 07:19:44 kuriyama Exp $ +# $Id: Makefile,v 1.5 1999/04/16 17:03:01 max Exp $ # DISTNAME= postgresql-6.4.2 @@ -121,7 +121,7 @@ pre-install: @ ${MKDIR} ${PREFIX}/${INSTALL_DIR} @ ${SETENV} INSTALL_DIR=${INSTALL_DIR} \ PGSQL_UID=${PGSQL_UID} PGSQL_GID=${PGSQL_GID} \ - ${SH} ${PKGDIR}/INSTALL PRE-INSTALL + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL post-install: @ if [ ! -f ${PREFIX}/${INSTALL_DIR}/.profile ]; then \ ${ECHO} "PATH=${PATH}:${PREFIX}/${INSTALL_DIR}/bin" \ diff --git a/japanese/postgresql-tcltk/pkg-install b/japanese/postgresql-tcltk/pkg-install index e589ba9ef351..1fb5e347efe5 100644 --- a/japanese/postgresql-tcltk/pkg-install +++ b/japanese/postgresql-tcltk/pkg-install @@ -48,7 +48,7 @@ yesno() { done } -case $1 in +case $2 in PRE-INSTALL) ## Hack /etc/master.passwd ## @@ -88,7 +88,7 @@ EOF if yesno "Would you like to create it automatically?" y; then # We need a command 'pw(8)' check_pw - pw useradd ${PGSQL_UID} -u 70 -g ${PGSQL_GID} -h - -d /usr/local/${INSTALL_DIR} \ + pw useradd ${PGSQL_UID} -u 70 -g ${PGSQL_GID} -h - -d ${PKG_PREFIX}/${INSTALL_DIR} \ -s /bin/sh -c "PostgreSQL pseudo-user" || exit else echo "Please create it, and try again." diff --git a/japanese/postgresql/Makefile b/japanese/postgresql/Makefile index 495ff374464c..f8c17dce66bc 100644 --- a/japanese/postgresql/Makefile +++ b/japanese/postgresql/Makefile @@ -3,7 +3,7 @@ # Date created: 25 Nov 1998 # Whom: Ichiro Fukuhara <ichiro@ichiro.org> # -# $Id: Makefile,v 1.4 1999/01/01 07:19:44 kuriyama Exp $ +# $Id: Makefile,v 1.5 1999/04/16 17:03:01 max Exp $ # DISTNAME= postgresql-6.4.2 @@ -121,7 +121,7 @@ pre-install: @ ${MKDIR} ${PREFIX}/${INSTALL_DIR} @ ${SETENV} INSTALL_DIR=${INSTALL_DIR} \ PGSQL_UID=${PGSQL_UID} PGSQL_GID=${PGSQL_GID} \ - ${SH} ${PKGDIR}/INSTALL PRE-INSTALL + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL post-install: @ if [ ! -f ${PREFIX}/${INSTALL_DIR}/.profile ]; then \ ${ECHO} "PATH=${PATH}:${PREFIX}/${INSTALL_DIR}/bin" \ diff --git a/japanese/postgresql/pkg-install b/japanese/postgresql/pkg-install index e589ba9ef351..1fb5e347efe5 100644 --- a/japanese/postgresql/pkg-install +++ b/japanese/postgresql/pkg-install @@ -48,7 +48,7 @@ yesno() { done } -case $1 in +case $2 in PRE-INSTALL) ## Hack /etc/master.passwd ## @@ -88,7 +88,7 @@ EOF if yesno "Would you like to create it automatically?" y; then # We need a command 'pw(8)' check_pw - pw useradd ${PGSQL_UID} -u 70 -g ${PGSQL_GID} -h - -d /usr/local/${INSTALL_DIR} \ + pw useradd ${PGSQL_UID} -u 70 -g ${PGSQL_GID} -h - -d ${PKG_PREFIX}/${INSTALL_DIR} \ -s /bin/sh -c "PostgreSQL pseudo-user" || exit else echo "Please create it, and try again." diff --git a/japanese/postgresql7/Makefile b/japanese/postgresql7/Makefile index 495ff374464c..f8c17dce66bc 100644 --- a/japanese/postgresql7/Makefile +++ b/japanese/postgresql7/Makefile @@ -3,7 +3,7 @@ # Date created: 25 Nov 1998 # Whom: Ichiro Fukuhara <ichiro@ichiro.org> # -# $Id: Makefile,v 1.4 1999/01/01 07:19:44 kuriyama Exp $ +# $Id: Makefile,v 1.5 1999/04/16 17:03:01 max Exp $ # DISTNAME= postgresql-6.4.2 @@ -121,7 +121,7 @@ pre-install: @ ${MKDIR} ${PREFIX}/${INSTALL_DIR} @ ${SETENV} INSTALL_DIR=${INSTALL_DIR} \ PGSQL_UID=${PGSQL_UID} PGSQL_GID=${PGSQL_GID} \ - ${SH} ${PKGDIR}/INSTALL PRE-INSTALL + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL post-install: @ if [ ! -f ${PREFIX}/${INSTALL_DIR}/.profile ]; then \ ${ECHO} "PATH=${PATH}:${PREFIX}/${INSTALL_DIR}/bin" \ diff --git a/japanese/postgresql7/pkg-install b/japanese/postgresql7/pkg-install index e589ba9ef351..1fb5e347efe5 100644 --- a/japanese/postgresql7/pkg-install +++ b/japanese/postgresql7/pkg-install @@ -48,7 +48,7 @@ yesno() { done } -case $1 in +case $2 in PRE-INSTALL) ## Hack /etc/master.passwd ## @@ -88,7 +88,7 @@ EOF if yesno "Would you like to create it automatically?" y; then # We need a command 'pw(8)' check_pw - pw useradd ${PGSQL_UID} -u 70 -g ${PGSQL_GID} -h - -d /usr/local/${INSTALL_DIR} \ + pw useradd ${PGSQL_UID} -u 70 -g ${PGSQL_GID} -h - -d ${PKG_PREFIX}/${INSTALL_DIR} \ -s /bin/sh -c "PostgreSQL pseudo-user" || exit else echo "Please create it, and try again." |