[or-cvs] r15046: Make clean rule remove both TBB and TIBB (torbrowser/trunk/build-scripts)

[sjm217@xxxxxxxx]

Author: sjm217
Date: 2008-06-08 16:51:15 -0400 (Sun, 08 Jun 2008)
New Revision: 15046

Modified:
   torbrowser/trunk/build-scripts/Makefile
Log:
Make clean rule remove both TBB and TIBB

Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2008-06-08 20:17:02 UTC (rev 15045)
+++ torbrowser/trunk/build-scripts/Makefile	2008-06-08 20:51:15 UTC (rev 15046)
@@ -41,10 +41,13 @@
 
 ## Version and name of the compressed bundle (also used for source)
 VERSION=1.0.3
+DEFAULT_COMPRESSED_NAME=tor-browser-$(VERSION)
+IM_COMPRESSED_NAME=tor-im-browser-$(VERSION)
+
 ifeq ($(USE_PIDGIN),1)
-COMPRESSED_NAME=tor-im-browser-$(VERSION)
+COMPRESSED_NAME=$(IM_COMPRESSED_NAME)
 else
-COMPRESSED_NAME=tor-browser-$(VERSION)
+COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME)
 endif
 
 ## Extensions to install by default
@@ -71,9 +74,9 @@
 
 all-bundles-both:
 	USE_PIDGIN=1 make all-bundles
-	USE_PIDGIN=1 make clean
+	make clean
 	USE_PIDGIN=0 make all-bundles
-	USE_PIDGIN=0 make clean
+	make clean
 
 all-bundles: all-compressed-bundles all-split-bundles
 
@@ -112,8 +115,10 @@
 
 ## Also remove the output files
 reallyclean: clean
-	rm -fr $(COMPRESSED_NAME)_*.exe
-	rm -fr $(COMPRESSED_NAME)_*.rar	
+	rm -fr $(IM_COMPRESSED_NAME)_*.exe
+	rm -fr $(IM_COMPRESSED_NAME)_*.rar	
+	rm -fr $(DEFAULT_COMPRESSED_NAME)_*.exe
+	rm -fr $(DEFAULT_COMPRESSED_NAME)_*.rar	
 
 ##
 ## Generate a non-localized bundle and put in $(DEST)