kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make this work on Solaris again.

Browse source 
Minor formatting changes around the pkg-su-install target.

Pass on any PKG_DEBUG_LEVEL as well as FORCE_PKG_REGISTER definitions.
This commit is contained in:
agc 1999-04-06 14:11:10 +00:00
parent c846125829
commit a2ea4de8a3
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
mk/bsd.pkg.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.pkg.mk,v 1.246 1999/04/06 09:39:30 agc Exp $ # $NetBSD: bsd.pkg.mk,v 1.247 1999/04/06 14:11:10 agc Exp $
# #
# This file is in the public domain. # This file is in the public domain.
# #
@ -1479,24 +1479,25 @@ pkg-su-install:
${_PKG_SILENT}${_PKG_DEBUG} \ ${_PKG_SILENT}${_PKG_DEBUG} \
if [ `${ID} -u` = 0 ]; then \ if [ `${ID} -u` = 0 ]; then \
${MAKE} ${.MAKEFLAGS} root-install; \ ${MAKE} ${.MAKEFLAGS} root-install; \
elif [ "X${BATCH}" != X"" ]; then \
${ECHO_MSG} "Warning: Batch mode, not superuser, can't run mtree."; \
${ECHO_MSG} "Become root and try again to ensure correct permissions."; \
else \ else \
if [ "X${BATCH}" != X"" ]; then \ make=`${TYPE} ${MAKE} | ${AWK} '{ print $$NF }'`; \
${ECHO_MSG} "Warning: Batch mode, not superuser, can't run mtree."; \ args=""; \
${ECHO_MSG} "Become root and try again to ensure correct permissions."; \ if [ "X${FORCE_PKG_REGISTER}" != X"" ]; then \
else \ args="FORCE_PKG_REGISTER=1"; \
make=`${TYPE} ${MAKE} | ${AWK} '{ print $$NF }'`; \ fi; \
force=""; \ if [ "X${PKG_DEBUG_LEVEL}" != X"" ]; then \
if [ "X${FORCE_PKG_REGISTER}" != X"" ]; then \ args="$$args PKG_DEBUG_LEVEL=${PKG_DEBUG_LEVEL}"; \
force="FORCE_PKG_REGISTER=1"; \ fi; \
fi; \ if [ "X${PRE_ROOT_CMD}" != "X${TRUE}" ]; then \
if [ "X${PRE_ROOT_CMD}" != "X${TRUE}" ]; then \ ${ECHO} "*** WARNING *** Running: ${PRE_ROOT_CMD}"; \
${ECHO} "*** WARNING *** Running: ${PRE_ROOT_CMD}"; \ ${PRE_ROOT_CMD}; \
${PRE_ROOT_CMD}; \ fi; \
fi; \ ${ECHO_MSG} "===> Becoming root@`/bin/hostname` to install ${PKGNAME}."; \
${ECHO_MSG} "===> Becoming root@`/bin/hostname` to install ${PKGNAME}."; \ ${ECHO_MSG} -n "`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'` ";\
${ECHO_MSG} -n "`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'` ";\ ${SU_CMD} "cd ${.CURDIR}; $$make $$args ${.MAKEFLAGS} root-install"; \
${SU_CMD} "cd ${.CURDIR}; $$make $$force ${.MAKEFLAGS} root-install"; \
fi; \
fi fi
# Empty pre-* and post-* targets, note we can't use .if !target() # Empty pre-* and post-* targets, note we can't use .if !target()
@ -2247,7 +2248,7 @@ fake-pkg: ${PLIST} ${DESCR}
for dep in `${MAKE} package-depends PACKAGE_DEPENDS_WITH_PATTERNS=true ECHO_MSG=${TRUE} | sort -u`; do \ for dep in `${MAKE} package-depends PACKAGE_DEPENDS_WITH_PATTERNS=true ECHO_MSG=${TRUE} | sort -u`; do \
realdep="`${PKG_INFO} -e \"$$dep\" || ${TRUE}`" ; \ realdep="`${PKG_INFO} -e \"$$dep\" || ${TRUE}`" ; \
${ECHO} "a sanity check should be put in here to prevent some user having the pkg installed/registered twice somehow - HF" >/dev/null ; \ ${ECHO} "a sanity check should be put in here to prevent some user having the pkg installed/registered twice somehow - HF" >/dev/null ; \
if [ -z $$realdep ]; then \ if ${TEST} -z $$realdep; then \
${ECHO} "$$dep not installed - NOT registered" ; \ ${ECHO} "$$dep not installed - NOT registered" ; \
elif [ -d ${PKG_DBDIR}/$$realdep ]; then \ elif [ -d ${PKG_DBDIR}/$$realdep ]; then \
if ${TEST} ! -e ${PKG_DBDIR}/$$realdep/+REQUIRED_BY; then \ if ${TEST} ! -e ${PKG_DBDIR}/$$realdep/+REQUIRED_BY; then \