Rev 3440: (jam) make dist, etc clean up after themselves in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3440
revision-id:pqm at pqm.ubuntu.com-20080520094809-682f95w1gbrji5t0
parent: pqm at pqm.ubuntu.com-20080520071650-9vbizb6v6ji8k1jy
parent: john at arbash-meinel.com-20080509205205-r2q3p7qjbc7tkjro
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-05-20 10:48:09 +0100
message:
  (jam) make dist, etc clean up after themselves
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
    ------------------------------------------------------------
    revno: 3421.2.1
    revision-id:john at arbash-meinel.com-20080509205205-r2q3p7qjbc7tkjro
    parent: pqm at pqm.ubuntu.com-20080509190952-oqlrpkxzoruxymko
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: cleanup_dist
    timestamp: Fri 2008-05-09 15:52:05 -0500
    message:
      Update make targets for distribution.
      
      Use more descriptive temporary directories, and clean up when the
      appropriate action is finished.
    modified:
      Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
=== modified file 'Makefile'
--- a/Makefile	2008-05-19 07:35:22 +0000
+++ b/Makefile	2008-05-20 09:48:09 +0000
@@ -217,7 +217,7 @@
 dist: 
 	version=`./bzr version --short` && \
 	echo Building distribution of bzr $$version && \
-	expbasedir=`mktemp -d` && \
+	expbasedir=`mktemp -t -d tmp_bzr_dist.XXXXXXXXXX` && \
 	expdir=$$expbasedir/bzr-$$version && \
 	tarball=$$PWD/../bzr-$$version.tar.gz && \
 	$(MAKE) clean && \
@@ -226,15 +226,17 @@
 	cp bzrlib/*.c $$expdir/bzrlib/. && \
 	tar cfz $$tarball -C $$expbasedir bzr-$$version && \
 	gpg --detach-sign $$tarball && \
-	echo $$tarball done.
+	echo $$tarball done. && \
+	rm -rf $$expbasedir
 
 # run all tests in a previously built tarball
 check-dist-tarball:
-	tmpdir=`mktemp -d` && \
+	tmpdir=`mktemp -t -d tmp_bzr_check_dist.XXXXXXXXXX` && \
 	version=`./bzr version --short` && \
 	tarball=$$PWD/../bzr-$$version.tar.gz && \
 	tar Cxz $$tmpdir -f $$tarball && \
-	$(MAKE) -C $$tmpdir/bzr-$$version check 
+	$(MAKE) -C $$tmpdir/bzr-$$version check && \
+	rm -rf $$tmpdir
 
 
 # upload previously built tarball to the download directory on bazaar-vcs.org,