X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=blobdiff_plain;f=Makefile.debian;h=6fcbad0d4adf9a549a7871ed1110d38e2384e0e1;hp=03d16fc071e235fa1d55cff6cbed9a120a448142;hb=61482b6ff0e5e8a3cccf1248b0fd38266f6e0b45;hpb=7a8c363290f890a51fd4d61d68099de284efff3b

diff --git a/Makefile.debian b/Makefile.debian
index 03d16fc071..6fcbad0d4a 100644
--- a/Makefile.debian
+++ b/Makefile.debian
@@ -126,7 +126,7 @@ MINOR=-$(BRANCH)-$(svnrev)+$(XDISTRIB)
 
 DEBUG=--debug
 DEBUG=
-DEBBUILDOPTS=--debbuildopts -sa 
+DEBBUILDOPTS=--debbuildopts -sa
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null)
 
 # Some doc found there http://wiki.debian.org/cowbuilder
@@ -143,7 +143,7 @@ CHANGEFILE=$(PKGNAME)_$(SMAJOR)$(MINOR)_$(ARCH).changes
 PCHANGEFILE=$(PKGNAME)_$(SMAJOR)$(MINOR)+p_$(ARCH).changes
 
 # Quite heavy version, but still requires to be root
-COWBUILDERCMD=cd $(BUILDPLACE) && dpkg-source -x $(BUILDFILES)/$(DSCFILE) ; cd $(BUILDPLACE)/$(PKGNAME)-$(SMAJOR) && pdebuild --pbuilder cowbuilder --buildresult $(BUILDRESULT) -- --basepath $(COWBUILDERBASE)/base-$(DISTRIB)-$(ARCH).cow --buildplace $(BUILDPLACE) --aptcache $(APTCACHE) ; rm -rf $(BUILDPLACE)/$(PKGNAME)-$(SMAJOR) 
+COWBUILDERCMD=cd $(BUILDPLACE) && dpkg-source -x $(BUILDFILES)/$(DSCFILE) ; cd $(BUILDPLACE)/$(PKGNAME)-$(SMAJOR) && pdebuild --pbuilder cowbuilder --buildresult $(BUILDRESULT) -- --basepath $(COWBUILDERBASE)/base-$(DISTRIB)-$(ARCH).cow --buildplace $(BUILDPLACE) --aptcache $(APTCACHE) ; rm -rf $(BUILDPLACE)/$(PKGNAME)-$(SMAJOR)
 # This one is with sudo and probably faster
 COWBUILDERCMD=sudo /usr/sbin/cowbuilder --build --basepath $(COWBUILDERBASE)/base-$(DISTRIB)-$(ARCH).cow --configfile $(COWBUILDERBASE)/configfile-$(ARCH) $(BUILDFILES)/$(DSCFILE) $(DEBBUILDOPTS)
 
@@ -236,13 +236,13 @@ documentor_subdir=PhpDocumentor-1.4.3
 #
 
 orig:   # Make Debian package .orig tarball #
-	$(MAKE) $(TARBALLS)/$(ORIGFILE) 
+	$(MAKE) $(TARBALLS)/$(ORIGFILE)
 
 #
 # PHPDOCUMENTOR
 #
 # Get phpdocumentor, install phpdocumentor, build $(PKGNAME) phpdoc
-phpdoc: $(PKGDIR)/docs/phpdoc/docs 
+phpdoc: $(PKGDIR)/docs/phpdoc/docs
 
 doc:
 	(cd src/docs/docbook ; make debian TARGET=$(CURDIR)/build/docs/docbook/)
@@ -261,7 +261,7 @@ phpdocumentor_unpack: phpdocumentor_get
 $(documentor_path)/$(documentor_subdir)/patched: phpdocumentor_unpack
 	cd $(documentor_path)/$(documentor_subdir) && \
         patch < $(CURDIR)/$(PKGDIR)/docs/phpdoc/phpDocumentor.ini.patch \
-        && touch $(documentor_path)/$(documentor_subdir)/patched 
+        && touch $(documentor_path)/$(documentor_subdir)/patched
 $(PKGDIR)/docs/phpdoc/docs: $(documentor_path)/$(documentor_subdir)/patched
 	cd $(PKGDIR)/docs/phpdoc/ && ./makedoc.sh
 
@@ -457,7 +457,8 @@ $(LOCALREPO):
 	if [ -w `dirname $@` ] ; then mkdir $@ ; else sudo mkdir $@ ; sudo chown `id -u`.`id -g` $@; fi
 
 clean: # Clean $(BUILDPLACE) $(BUILDFILES) $(TARBALLS) (intermediate files) #
-	rm -rf $(BUILDPLACE) $(BUILDFILES) $(TARBALLS) 
+	rm -rf $(BUILDPLACE)/$(PKGNAME)-$(SMAJOR) $(BUILDFILES) $(TARBALLS)
+	rmdir $(BUILDPLACE) && mkdir $(BUILDPLACE) || true
 
 cleanenv: # Clean $(COWBUILDERBASE) $(PBUILDERTGZ) (chroots)#
 	sudo rm -rf $(COWBUILDERBASE) $(PBUILDERTGZ)