[pkgsrc/trunk]: pkgsrc/mk Remove some extraneous commands and switch some tar...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7511901d06b7
branches:  trunk
changeset: 466493:7511901d06b7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jan 19 14:54:26 2004 +0000

description:
Remove some extraneous commands and switch some targets to be conditionally
defined.

diffstat:

 mk/bsd.pkg.mk |  19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diffs (70 lines):

diff -r 60a7c4981a5e -r 7511901d06b7 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon Jan 19 13:38:28 2004 +0000
+++ b/mk/bsd.pkg.mk     Mon Jan 19 14:54:26 2004 +0000
@@ -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_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 @@
            fi;                                                         \
        done
 .  endfor
-.else
-       ${_PKG_SILENT}${_PKG_DEBUG}${TRUE}
-.endif
-
+.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 @@
                ${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 @@
 .  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 @@
        fi
 .    endfor
 .  endif
-.else
-       ${_PKG_SILENT}${_PKG_DEBUG}${TRUE}
 .endif
 
 .PHONY: post-configure