[SVN-Commit] r985 - trunk/security/nss

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Tue Sep  4 22:50:21 2012
New Revision: 985

Log:
unbreak install WITH_DEBUG

Modified:
   trunk/security/nss/Makefile

Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile	Tue Sep  4 20:49:25 2012	(r984)
+++ trunk/security/nss/Makefile	Tue Sep  4 22:50:21 2012	(r985)
@@ -41,7 +41,11 @@
 EXTRACT_AFTER_ARGS=| ${TAR} -xf -	\
 	${EXTERNALS:C,^,--exclude ${PORTNAME}-${PORTVERSION}/mozilla/,}
 
+.if !defined(WITH_DEBUG)
 BINS=${DIST}/${OPSYS}${OSREL}_OPT.OBJ
+.else
+BINS=${DIST}/${OPSYS}${OSREL}_DBG.OBJ
+.endif
 
 INSTALL_BINS=	certcgi certutil checkcert cmsutil crlutil derdump makepqg \
 		mangle modutil ocspclnt oidcalc p7content p7env p7sign \
@@ -91,15 +95,15 @@
 	${MKDIR} ${PREFIX}/include/nss/nss ${PREFIX}/lib/nss
 	${FIND} ${DIST}/public/nss -type l \
 	    	-exec ${INSTALL_DATA} {} ${PREFIX}/include/nss/nss \;
-	${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/*.so.1 \
+	${INSTALL_DATA} ${BINS}/lib/*.so.1 \
 		${PREFIX}/lib/nss
-	${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/libcrmf.a \
+	${INSTALL_DATA} ${BINS}/lib/libcrmf.a \
 	    	${PREFIX}/lib/nss
 .for bin in ${INSTALL_BINS}
-	${INSTALL_PROGRAM} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/bin/${bin} \
+	${INSTALL_PROGRAM} ${BINS}/bin/${bin} \
 		${PREFIX}/bin
 .endfor
-	cd ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib && \
+	cd ${BINS}/lib && \
 	    	${TAR} -cf - *.so | ${TAR} --unlink -C ${PREFIX}/lib/nss -xf -
 	${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/nss.pc ${PREFIX}/libdata/pkgconfig