[or-cvs] r17764: {torbrowser} Also remove older versions of the bundle when doing "make re (torbrowser/trunk/build-scripts)

sjm217 at seul.org sjm217 at seul.org
Wed Dec 24 17:32:51 UTC 2008


Author: sjm217
Date: 2008-12-24 12:32:51 -0500 (Wed, 24 Dec 2008)
New Revision: 17764

Modified:
   torbrowser/trunk/build-scripts/Makefile
Log:
Also remove older versions of the bundle when doing "make reallyclean"

Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2008-12-24 16:40:39 UTC (rev 17763)
+++ torbrowser/trunk/build-scripts/Makefile	2008-12-24 17:32:51 UTC (rev 17764)
@@ -41,8 +41,10 @@
 
 ## Version and name of the compressed bundle (also used for source)
 VERSION=1.1.7
-DEFAULT_COMPRESSED_NAME=tor-browser-$(VERSION)
-IM_COMPRESSED_NAME=tor-im-browser-$(VERSION)
+DEFAULT_COMPRESSED_BASENAME=tor-browser-
+IM_COMPRESSED_BASENAME=tor-im-browser-
+DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)
+IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)
 
 ifeq ($(USE_PIDGIN),1)
 COMPRESSED_NAME=$(IM_COMPRESSED_NAME)
@@ -115,12 +117,12 @@
 
 ## Also remove the output files
 reallyclean: clean
-	rm -fr $(IM_COMPRESSED_NAME)_*.exe
-	rm -fr $(IM_COMPRESSED_NAME)_*.rar	
-	rm -fr $(IM_COMPRESSED_NAME)_*_split
-	rm -fr $(DEFAULT_COMPRESSED_NAME)_*.exe
-	rm -fr $(DEFAULT_COMPRESSED_NAME)_*.rar
-	rm -fr $(DEFAULT_COMPRESSED_NAME)_*_split
+	rm -fr $(IM_COMPRESSED_BASENAME)*_*.exe
+	rm -fr $(IM_COMPRESSED_BASENAME)*_*.rar	
+	rm -fr $(IM_COMPRESSED_BASENAME)*_*_split
+	rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.exe
+	rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.rar
+	rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*_split
 
 ##
 ## Generate a non-localized bundle and put in $(DEST)



More information about the tor-commits mailing list