Module Name: othersrc
Committed By: agc
Date: Mon May 9 15:03:58 UTC 2011
Modified Files:
othersrc/external/bsd/gensetlist: bsd.setlist.mk
Log Message:
derive syspkg category (CATEGORY) from LIB or PROG if one of them is defined
don't try to be smart with the gensetlist invocation, just call it when
needed.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/gensetlist/bsd.setlist.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/gensetlist/bsd.setlist.mk
diff -u othersrc/external/bsd/gensetlist/bsd.setlist.mk:1.1.1.1 othersrc/external/bsd/gensetlist/bsd.setlist.mk:1.2
--- othersrc/external/bsd/gensetlist/bsd.setlist.mk:1.1.1.1 Sat Mar 12 08:20:42 2011
+++ othersrc/external/bsd/gensetlist/bsd.setlist.mk Mon May 9 15:03:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.setlist.mk,v 1.1.1.1 2011/03/12 08:20:42 agc Exp $
+# $NetBSD: bsd.setlist.mk,v 1.2 2011/05/09 15:03:58 agc Exp $
# Makefile fragment to hand the args to "setlist" from the Makefile
@@ -31,13 +31,22 @@
GENSETLIST_ARGS+=-v SYMLINKS=${SYMLINKS:Q}
.endif
+# guard keyword i.e. MKWIBBLE - just give the "wibble" part
.if defined(GUARD)
GENSETLIST_ARGS+=-D ${GUARD:Q}
.endif
+# syspkg category
+.if !defined(CATEGORY)
+. if defined(PROG)
+CATEGORY=${PROG}
+. elif defined(LIB)
+CATEGORY=${LIB}
+. endif
+.endif
.if defined(CATEGORY)
GENSETLIST_ARGS+=-c ${CATEGORY:Q}
.endif
setlist:
- ${.CURDIR}/../gensetlist ${GENSETLIST_ARGS}
+ gensetlist ${GENSETLIST_ARGS}
