diff options
author | jlam <jlam> | 2004-01-19 14:54:26 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-01-19 14:54:26 +0000 |
commit | 01d8fa05480a736cb65ba96bbf07995c83f70d96 (patch) | |
tree | 05ac16cba74bb458e2f8cf0ae453154b35f206c5 /mk | |
parent | 87036e50cdbe8a577fcc3fba8b48c04858f0e87f (diff) | |
download | pkgsrc-01d8fa05480a736cb65ba96bbf07995c83f70d96.tar.gz |
Remove some extraneous commands and switch some targets to be conditionally
defined.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.mk | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 933171a24f0..96510b53e1c 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1346 2004/01/18 00:51:30 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1347 2004/01/19 14:54:26 jlam Exp $ # # This file is in the public domain. # @@ -2282,10 +2282,10 @@ _REPLACE.perl.new= ${PERL5} _REPLACE_FILES.perl= ${REPLACE_PERL} .endif +.if defined(REPLACE_INTERPRETER) _CONFIGURE_PREREQ+= replace-interpreter .PHONY: replace-interpreter replace-interpreter: -.if defined(REPLACE_INTERPRETER) . for lang in ${REPLACE_INTERPRETER} ${_PKG_SILENT}${_PKG_DEBUG} \ cd ${WRKSRC}; \ @@ -2300,14 +2300,12 @@ replace-interpreter: fi; \ done . endfor -.else - ${_PKG_SILENT}${_PKG_DEBUG}${TRUE} .endif +.if defined(USE_LIBTOOL) && defined(LTCONFIG_OVERRIDE) _CONFIGURE_PREREQ+= do-ltconfig-override .PHONY: do-ltconfig-override do-ltconfig-override: -.if defined(USE_LIBTOOL) && defined(LTCONFIG_OVERRIDE) . for ltconfig in ${LTCONFIG_OVERRIDE} ${_PKG_SILENT}${_PKG_DEBUG} \ if [ -f ${ltconfig} ]; then \ @@ -2317,8 +2315,6 @@ do-ltconfig-override: ${CHMOD} +x ${ltconfig}; \ fi . endfor -.else - ${_PKG_SILENT}${_PKG_DEBUG}${TRUE} .endif .if defined(CONFIG_GUESS_OVERRIDE) || defined(CONFIG_SUB_OVERRIDE) @@ -2380,10 +2376,11 @@ do-configure: . endif .endif +.if defined(USE_LIBTOOL) && \ + (defined(LIBTOOL_OVERRIDE) || defined(SHLIBTOOL_OVERRIDE)) _CONFIGURE_POSTREQ+= do-libtool-override .PHONY: do-libtool-override do-libtool-override: -.if defined(USE_LIBTOOL) . if defined(LIBTOOL_OVERRIDE) . for libtool in ${LIBTOOL_OVERRIDE} ${_PKG_SILENT}${_PKG_DEBUG} \ @@ -2402,8 +2399,6 @@ do-libtool-override: fi . endfor . endif -.else - ${_PKG_SILENT}${_PKG_DEBUG}${TRUE} .endif .PHONY: post-configure |