[or-cvs] r13511: Copy over GNU regexp library: Now successfully builds a non- (torbrowser/trunk/build-scripts)

[sjm217@xxxxxxxx]

Author: sjm217
Date: 2008-02-14 12:57:13 -0500 (Thu, 14 Feb 2008)
New Revision: 13511

Modified:
   torbrowser/trunk/build-scripts/Makefile
Log:
Copy over GNU regexp library: Now successfully builds a non-internationalized bundle

Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2008-02-14 08:35:01 UTC (rev 13510)
+++ torbrowser/trunk/build-scripts/Makefile	2008-02-14 17:57:13 UTC (rev 13511)
@@ -61,7 +61,7 @@
 ##
 
 clean:
-	rm -fr $(DEST)
+	rm -fr $(DEST) generic-bundle.stamp
 	rm -f *~
 	rm -fr $(DEST) $(BINARIES) $(DOCS)
 	rm -f "Tor Browser.exe"
@@ -71,7 +71,8 @@
 ##
 
 ## Install binaries, documentation, FirefoxPortable and launcher into $(DEST)
-$(DEST): directory-structure install-binaries install-docs install-firefoxportable configure-apps launcher
+generic-bundle.stamp: directory-structure install-binaries install-docs install-firefoxportable configure-apps launcher
+	touch generic-bundle.stamp
 
 APPDIR=$(DEST)/App
 DOCSDIR=$(DEST)/Docs
@@ -90,6 +91,7 @@
 ## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/>
 install-binaries: 
 	cp $(MING)/mingwm10.dll $(APPDIR)
+	cp $(MING)/libgnurx-0.dll $(APPDIR)
 	cp $(QT)/QtCore4.dll $(QT)/QtGui4.dll \
            $(QT)/QtNetwork4.dll $(QT)/QtXml4.dll $(APPDIR) 
 	cp $(VIDALIA)/src/vidalia/vidalia.exe $(APPDIR)
@@ -160,7 +162,7 @@
 bundle_%:
 	LANGCODE=$* make bundle
 
-bundle: copy-base install-extensions patch-vidalia-language patch-firefox-config
+bundle: generic-bundle.stamp copy-base install-extensions patch-vidalia-language patch-firefox-config
 
 compress-bundle:
 	cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -sfx7z.sfx $(NAME)_$(LANGCODE).exe $(NAME)