diff options
-rw-r--r-- | mk/plist/plist.mk | 8 | ||||
-rw-r--r-- | mk/plist/print-plist.mk | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/mk/plist/plist.mk b/mk/plist/plist.mk index 4575bb309cb..da6e809f08d 100644 --- a/mk/plist/plist.mk +++ b/mk/plist/plist.mk @@ -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 @@ _SHLIB_TYPE_cmd= \ 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 --git a/mk/plist/print-plist.mk b/mk/plist/print-plist.mk index f3c6dcf5ab8..b9b9bab0080 100644 --- a/mk/plist/print-plist.mk +++ b/mk/plist/print-plist.mk @@ -116,7 +116,7 @@ print-PLIST: ${_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 ;; \ |