Use MOZILLA_VERSION for the version in Info.plist so it doesn't need to be updated by hand. Rename Info.plist to Info.plist.in accordingly. b=229467 r+sr=bryner

git-svn-id: svn://10.0.0.236/trunk@169502 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/xpfe/bootstrap/Makefile.in

@@ -313,6 +313,8 @@ DESKTOP_ICON_FILES = $(addsuffix $(ICON_SUFFIX), $(DESKTOP_ICONS) $(DESKTOP_ICON
 
 GARBAGE	+= $(addprefix $(DIST)/bin/chrome/icons/default/,$(DESKTOP_ICON_FILES))
 
+all::
+
 libs:: $(addprefix icons/$(ICON_DIR)/,$(DESKTOP_ICON_FILES))
 	$(INSTALL) $^ $(DIST)/bin/chrome/icons/default
 
@@ -457,7 +459,8 @@ endif
 
 libs:: $(PROGRAM)
 	mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS
-	rsync -a $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app
+	rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app
+	sed -e "s/MOZILLA_VERSION/$(MOZILLA_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist
 	rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/MacOS
 	rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
 	rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS

mozilla/xpfe/bootstrap/macbuild/Contents/Info.plist.in

@@ -9,7 +9,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.mozilla.mozilla</string>
 	<key>CFBundleVersion</key>
-	<string>1.8b</string>
+	<string>MOZILLA_VERSION</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleName</key>
@@ -21,9 +21,9 @@
 	<key>CFBundleIconFile</key>
 	<string>mozilla.icns</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.8b</string>
+	<string>MOZILLA_VERSION</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Mozilla 1.8b, © 1998-2005 The Mozilla Organization</string>
+	<string>Mozilla MOZILLA_VERSION, © 1998-2005 The Mozilla Organization</string>
         <key>NSAppleScriptEnabled</key>
         <true/>
 	<key>CFBundleDocumentTypes</key>