pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/plist Remove the show-shlib-type target since it's ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ea9793a24afa
branches:  trunk
changeset: 506302:ea9793a24afa
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jan 13 22:37:02 2006 +0000

description:
Remove the show-shlib-type target since it's no longer needed ... the
same value is returned by querying for SHLIB_TYPE via show-var, so
convert the only remaining use of show-shlib-type to just use SHLIB_TYPE.

diffstat:

 mk/plist/plist.mk       |  8 +-------
 mk/plist/print-plist.mk |  2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diffs (34 lines):

diff -r 9200a7d8f657 -r ea9793a24afa mk/plist/plist.mk
--- a/mk/plist/plist.mk Fri Jan 13 22:15:38 2006 +0000
+++ b/mk/plist/plist.mk Fri Jan 13 22:37:02 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: plist.mk,v 1.1 2006/01/12 23:43:57 jlam Exp $
+# $NetBSD: plist.mk,v 1.2 2006/01/13 22:37:02 jlam Exp $
 #
 # This Makefile fragment handles the creation of PLISTs for use by
 # pkg_create(8).
@@ -150,12 +150,6 @@
                RM=${TOOLS_RM:Q} TEST=${TOOLS_TEST:Q}                   \
        ${SH} ${.CURDIR}/../../mk/plist/shlib-type ${_OPSYS_SHLIB_TYPE:Q}
 
-.if !target(show-shlib-type)
-.PHONY: show-shlib-type
-show-shlib-type:
-       @${ECHO} ${SHLIB_TYPE:Q}
-.endif
-
 ######################################################################
 
 # GENERATE_PLIST is a sequence of commands, terminating in a semicolon,
diff -r 9200a7d8f657 -r ea9793a24afa mk/plist/print-plist.mk
--- a/mk/plist/print-plist.mk   Fri Jan 13 22:15:38 2006 +0000
+++ b/mk/plist/print-plist.mk   Fri Jan 13 22:37:02 2006 +0000
@@ -116,7 +116,7 @@
        ${_PKG_SILENT}${_PKG_DEBUG}\
        ${ECHO} '@comment $$'NetBSD'$$'
        ${_PKG_SILENT}${_PKG_DEBUG}\
-       shlib_type=`${MAKE} ${MAKEFLAGS} show-shlib-type`;              \
+       shlib_type=${SHLIB_TYPE:Q};                                     \
        case $$shlib_type in                                            \
        "a.out")        genlinks=1 ;;                                   \
        *)              genlinks=0 ;;                                   \



Home | Main Index | Thread Index | Old Index