BSDBuild: r801 - trunk

Author: vedge
Date: 2009-06-03 06:44:33 -0300 (Wed, 03 Jun 2009)
New Revision: 801

Modified:
   trunk/build.proj.mk
Log:
use ${TOP}/configure.lua instead of ${PROJINCLUDES}

Modified: trunk/build.proj.mk
===================================================================
--- trunk/build.proj.mk	2009-06-03 02:41:39 UTC (rev 800)
+++ trunk/build.proj.mk	2009-06-03 09:44:33 UTC (rev 801)
@@ -52,14 +52,14 @@
 		windows:vs2005:: \
 		windows:vs2008::

-CLEANFILES+=	${PREMAKEOUT} ${PROJINCLUDES}
+CLEANFILES+=	${PREMAKEOUT}

 proj-package:
 	@if [ "${PROJECT}" = "" ]; then \
 	    echo "cat Makefile | ${MKPROJFILES} > ${PREMAKEOUT}"; \
 	    cat Makefile | \
 	        env PROJTARGET="${PROJTARGET}" PROJOS="${PROJOS}" \
-		PROJFLAVOR="" PROJINCLUDES="${PROJINCLUDES}" \
+		PROJFLAVOR="" PROJINCLUDES="${TOP}/configure.lua" \
 	        ${MKPROJFILES} > ${PREMAKEOUT}; \
 	fi

@@ -94,7 +94,7 @@
 		    > configure.tmp; \
 		if [ $$? != 0 ]; then \
 			echo "mkconfigure failed"; \
-			rm -fR configure.tmp ${PROJINCLUDES}; \
+			rm -fR configure.tmp ${TOP}/configure.lua; \
 			exit 1; \
 		fi; \
 		echo "./configure.tmp $$_tgtopts --with-proj-generation"; \
@@ -106,7 +106,6 @@
 		fi; \
 		echo "${MAKE} proj-package-subdir"; \
 		env PROJTARGET="$$_tgtproj" PROJOS="$$_tgtos" \
-		    PROJINCLUDES="${PROJINCLUDES}" \
 		    ${MAKE} proj-package-subdir; \
 		\
 		if [ "${PROJCONFIGDIR}" != "" ]; then \
@@ -124,7 +123,7 @@
 	        cat Makefile | \
 		    env PROJFLAVOR="$$_tgtflav" \
 		    PROJOS="$$_tgtos" \
-		    PROJINCLUDES="${PROJINCLUDES}" \
+		    PROJINCLUDES="${TOP}/configure.lua" \
 		    ${MKPROJFILES} > ${PREMAKEOUT}; \
 	        perl ${TOP}/mk/cmpfiles.pl; \
 	        echo "${PREMAKE} ${PREMAKEFLAGS} --file ${PREMAKEOUT} \
@@ -156,10 +155,12 @@
 		cat ${PROJFILELIST} | ${ZIP} ${ZIPFLAGS} \
 		    ${PROJDIR}/$$_tgtproj-$$_tgtos$$_tgtflav.zip -@;\
 		if [ "${PROJNOCLEAN}" = "no" ]; then \
-			echo "* Cleaning up"; \
+			echo "cat .projfiles.out | perl ${TOP}/mk/cleanfiles.pl"; \
 			cat .projfiles.out | perl ${TOP}/mk/cleanfiles.pl; \
+			echo "rm -fR ${PROJCONFIGDIR} ${PROJFILELIST}"; \
 			rm -fR ${PROJCONFIGDIR} ${PROJFILELIST}; \
-			rm -f .projfiles.out ${PROJINCLUDES}; \
+			echo "rm -f .projfiles.out ${TOP}/configure.lua"; \
+			rm -f .projfiles.out ${TOP}/configure.lua; \
 		fi; \
 	done
 	@echo "* Done"