[Fusionforge-commits] r9333 - trunk

Christian Bayle cbayle at libremir.placard.fr.eu.org
Fri Apr 2 18:19:20 CEST 2010


Author: cbayle
Date: 2010-04-02 18:19:19 +0200 (Fri, 02 Apr 2010)
New Revision: 9333

Modified:
   trunk/Makefile.debian
Log:
Add BUILDERDIR var


Modified: trunk/Makefile.debian
===================================================================
--- trunk/Makefile.debian	2010-04-02 16:19:12 UTC (rev 9332)
+++ trunk/Makefile.debian	2010-04-02 16:19:19 UTC (rev 9333)
@@ -6,16 +6,21 @@
 PKGLETTER=$(shell echo $(PKGNAME) | cut -c1)
 ORIGIN=debian.fusionforge.org
 BRANCH=$(shell [ "$(shell echo $(basename $(CURDIR)) | sed 's/.*runk.*/trunk/')" = "trunk" ] && echo svn || echo brc)
-BUILDPLACE=$(CURDIR)/builder/buildplace
-BUILDFILES=$(CURDIR)/builder/buildfiles
+#
+BUILDERDIR=$(CURDIR)/builder
 BUILDRESULT=$(CURDIR)/result
-COWBUILDERBASE=$(CURDIR)/builder/cow
-PBUILDERTGZ=$(CURDIR)/builder/tgz
 TARBALLS=$(CURDIR)/tarballs
-APTCACHE=$(CURDIR)/builder/cache
-DISTRIB=$(shell echo $(XDISTRIB) | cut -c2-)
+#
+BUILDPLACE=$(BUILDERDIR)/buildplace
+BUILDFILES=$(BUILDERDIR)/buildfiles
+COWBUILDERBASE=$(BUILDERDIR)/cow
+PBUILDERTGZ=$(BUILDERDIR)/tgz
+APTCACHE=$(BUILDERDIR)/cache
+#
 LOCALREPODEB=/var/www/debian-fusionforge-$(BRANCH)
 LOCALREPOUBU=/var/www/ubuntu-fusionforge-$(BRANCH)
+#
+DISTRIB=$(shell echo $(XDISTRIB) | cut -c2-)
 SIGNKEY=yes
 DEBIANLIST=1lenny 2squeeze 3sid
 DEBIANLISTP=1etch
@@ -79,7 +84,8 @@
 
 list:
 	@echo ======================================================================================
-	@echo '=                    Available targets are listed below ($(BRANCH))($(ARCH))         ='
+	@echo '=                    Available targets are listed below ($(BRANCH))($(ARCH))        ='
+	@echo '=                    BUILDERDIR = $(BUILDERDIR)                                     ='
 	@echo ======================================================================================
 	@cat Makefile.debian | grep '^.*:.*#$$' | sed 's/FUSIONFORGE/$(FUSIONFORGE)/' | sed 's/^\(.*:\).*#\(.*\)#$$/\1		\2/'
 	@echo ======================================================================================




More information about the Fusionforge-commits mailing list