[cap4-devel] SF.net SVN: cap4:[1409] trunk/toolbox

[<cd...@us...>]

Revision: 1409
          http://cap4.svn.sourceforge.net/cap4/?rev=1409&view=rev
Author:   cdm4hp
Date:     2012-02-23 20:25:44 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
CDM: last svn commit and make rpm use local dir trees to store rpm to sanity check completion

Modified Paths:
--------------
    trunk/toolbox/Makefile
    trunk/toolbox/make.def
    trunk/toolbox/make.workbench

Modified: trunk/toolbox/Makefile
===================================================================
--- trunk/toolbox/Makefile	2012-02-23 17:33:57 UTC (rev 1408)
+++ trunk/toolbox/Makefile	2012-02-23 20:25:44 UTC (rev 1409)
@@ -10,6 +10,9 @@
 	@for TOOLS in $(TOOLDIRS); do \
 		[ -d $$TOOLS ] && $(MAKE) -C $$TOOLS download; \
 	done;
+	@for TOOLS in $(OTHERS); do \
+		[ -d $$TOOLS ] && $(MAKE) -C $$TOOLS download; \
+	done;
 
 rpm:
 	$(call print-header,"cap4 toolbox rpmbuild")
@@ -17,8 +20,17 @@
 		[ -d $$TOOLS ] && $(MAKE) -C $$TOOLS rpm; \
 	done;
 
+otherrpm:
+	$(call print-header,"cap4 toolbox rpmbuild")
+	@for TOOLS in $(OTHERS); do \
+		[ -d $$TOOLS ] && $(MAKE) -C $$TOOLS rpm; \
+	done;
+
 clean distclean:
 	$(call print-header,"cap4 toolbox clean")
 	@for TOOLS in $(TOOLDIRS); do \
 		[ -d $$TOOLS ] && $(MAKE) -C $$TOOLS clean; \
 	done;
+	@for TOOLS in $(OTHERS); do \
+		[ -d $$TOOLS ] && $(MAKE) -C $$TOOLS clean; \
+	done;

Modified: trunk/toolbox/make.def
===================================================================
--- trunk/toolbox/make.def	2012-02-23 17:33:57 UTC (rev 1408)
+++ trunk/toolbox/make.def	2012-02-23 20:25:44 UTC (rev 1409)
@@ -49,11 +49,12 @@
 	@if [ -f $1 ]; then \
 		file $1 | grep -q RPM; \
 		if [ $$? -eq 0 ]; then \
-			rpmbuild --rebuild $1 > .rpmbuild 2>&1; \
+			rpmbuild --define "%_topdir $(CURDIR)" --rebuild $1 > .rpmbuild 2>&1; \
 		else \
-			rpmbuild -tb $1 > .rpmbuild 2>&1; \
+			rpmbuild --define "%_topdir $(CURDIR)" -tb $1 > .rpmbuild 2>&1; \
 		fi; \
 	else \
 		echo "$1 not found, download manually or set http_proxy env variable?"; exit 1; \
 	fi;
 endef
+

Modified: trunk/toolbox/make.workbench
===================================================================
--- trunk/toolbox/make.workbench	2012-02-23 17:33:57 UTC (rev 1408)
+++ trunk/toolbox/make.workbench	2012-02-23 20:25:44 UTC (rev 1409)
@@ -13,5 +13,5 @@
 	@touch $@
 
 clean distclean:
-	rm -fr $(TAR) .rpmbuild-$(SRC) .rpmbuild
+	rm -fr $(TAR) .rpmbuild-$(SRC) .rpmbuild BUILD BUILDROOT RPMS SOURCES SPECS SRPMS
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.