4d551cc Simplify dependency generation — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Simplify dependency generation

Baptiste Daroussin committed 12 years ago

commit 4d551ccb8dcea66b2da19307adea2c07ae3804c4
parent 39b870b

2 files changed +10 -4

modified libpkg/Makefile

@@ -149,7 +149,10 @@ NOMAN= yes

 	    ${.IMPSRC} > ${.TARGET}
 afterdepend:
 depend: staticdepend
 .ORDER: ${DEPENDFILE} staticdepend
 staticdepend:
 .if defined(DPADD) && !empty(DPADD)
 	grep -q "^lib${LIB}.a:" ${DEPENDFILE} || echo lib${LIB}.a: ${DPADD} >> ${DEPENDFILE}
 	echo lib${LIB}.a: ${DPADD} >> ${DEPENDFILE}
 .endif

modified pkg/Makefile

@@ -164,7 +164,10 @@ ${PROGNAME}-static-install:

 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${_INSTALLFLAGS} ${PROG}-static ${DESTDIR}${BINDIR}/${PROGNAME}-static
 afterdepend:
 depend: staticdepend
 .ORDER: ${DEPENDFILE} staticdepend
 staticdepend:
 .if defined(DPADD_STATIC) && !empty(DPADD_STATIC)
 	grep -q "^${PROGNAME}-static:" ${DEPENDFILE} || echo ${PROGNAME}-static: ${DPADD_STATIC} >> ${DEPENDFILE}
 	echo ${PROGNAME}-static: ${DPADD_STATIC} >> ${DEPENDFILE}
 .endif