diff options
| author | rillig <rillig> | 2006-05-10 17:53:34 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-05-10 17:53:34 +0000 |
| commit | a8abd25e30cf061f10c84b3e651df8038ac63da2 (patch) | |
| tree | 8b37b1961120eab09d09b4d5f3b52571ac613b19 /mk | |
| parent | 8cb4ddf35478725ec8d0a4056d922c8c91880ab2 (diff) | |
| download | pkgsrc-a8abd25e30cf061f10c84b3e651df8038ac63da2.tar.gz | |
Fixed some pkglint warnings in the do-configure, do-build, do-test and
do-install targets. This fixes an endless loop occuring when running "make"
in regress/make-quoting.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d53d177fa65..99be1ab18fc 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1821 2006/05/06 03:28:44 reed Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1822 2006/05/10 17:53:34 rillig Exp $ # # This file is in the public domain. # @@ -1668,16 +1668,16 @@ do-configure: . if defined(HAS_CONFIGURE) . for _dir_ in ${CONFIGURE_DIRS} ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \ - cd ${WRKSRC}; cd ${_dir_}; \ + cd ${WRKSRC} && cd ${_dir_} && \ ${SETENV} \ - AWK="${TOOLS_AWK}" \ - INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \ - ac_given_INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_GAME="${INSTALL_GAME}" \ - INSTALL_GAME_DATA="${INSTALL_GAME_DATA}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + AWK=${TOOLS_AWK:Q} \ + INSTALL=${INSTALL:Q}\ -c\ -o\ ${BINOWN}\ -g\ ${BINGRP} \ + ac_given_INSTALL=${INSTALL:Q}\ -c\ -o\ ${BINOWN}\ -g\ ${BINGRP} \ + INSTALL_DATA=${INSTALL_DATA:Q} \ + INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \ + INSTALL_GAME=${INSTALL_GAME:Q} \ + INSTALL_GAME_DATA=${INSTALL_GAME_DATA:Q} \ + INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} \ ${CONFIGURE_ENV} ${CONFIG_SHELL} \ ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} . endfor @@ -1739,7 +1739,7 @@ BUILD_MAKE_FLAGS?= ${MAKE_FLAGS} do-build: . for _dir_ in ${BUILD_DIRS} ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \ - cd ${WRKSRC}; cd ${_dir_}; \ + cd ${WRKSRC} && cd ${_dir_} && \ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \ -f ${MAKEFILE} ${BUILD_TARGET} . endfor @@ -1757,7 +1757,7 @@ do-test: . if defined(TEST_TARGET) && !empty(TEST_TARGET) . for _dir_ in ${TEST_DIRS} ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \ - cd ${WRKSRC}; cd ${_dir_}; \ + cd ${WRKSRC} && cd ${_dir_} && \ ${SETENV} ${TEST_ENV} ${MAKE_PROGRAM} ${TEST_MAKE_FLAGS} \ -f ${MAKEFILE} ${TEST_TARGET} . endfor @@ -1773,7 +1773,7 @@ do-test: do-install: . for _dir_ in ${INSTALL_DIRS} ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \ - cd ${WRKSRC}; cd ${_dir_}; \ + cd ${WRKSRC} && cd ${_dir_} && \ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} \ -f ${MAKEFILE} ${INSTALL_TARGET} . endfor |