Bug 520928: Install Fennec & XULRunner to /opt [r=mark.finkle]

mobile/installer/Makefile.in

@@ -46,7 +46,14 @@ include $(DEPTH)/config/autoconf.mk
 GRE_MILESTONE = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
 GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
 
-DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID) 
+DEFINES += \
+	-DGRE_MILESTONE=$(GRE_MILESTONE) \
+	-DGRE_BUILDID=$(GRE_BUILDID) \
+	-Dinstalldir=$(installdir) \
+	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
+	-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
+	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+	$(NULL)
 
 NO_PKG_FILES = \
 	$(MOZ_APP_NAME)-config \
@@ -99,12 +106,28 @@ debian/control: $(srcdir)/debian/control.in $(LIBXUL_DIST)/bin/platform.ini
 	mkdir -p debian
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
         $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
+	
+debian/$(MOZ_APP_NAME).desktop: $(srcdir)/debian/$(MOZ_APP_NAME).desktop.in
+	mkdir -p debian
+	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+        $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
 
-deb: debian/control
-	rm -rf $(DEBDESTDIR)/usr/local/*
-	$(NSINSTALL) -D $(DEBDESTDIR)/usr/local
-	cd $(DEBDESTDIR)/usr/local; bunzip2 -c $(DEPTH)/../../../../dist/$(PKG_BASENAME)$(PKG_SUFFIX) | $(UNPACK_TAR)  
-	rm -rf $(DEBDESTDIR)/usr/local/$(MOZ_APP_NAME)/xulrunner	
+debian/$(MOZ_APP_NAME).links: $(srcdir)/debian/$(MOZ_APP_NAME).links.in
+	mkdir -p debian
+	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+        $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
+
+debian/$(MOZ_APP_NAME).service: $(srcdir)/debian/$(MOZ_APP_NAME).service.in
+	mkdir -p debian
+	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+        $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
+
+deb: debian/control debian/$(MOZ_APP_NAME).service debian/$(MOZ_APP_NAME).links debian/$(MOZ_APP_NAME).desktop \
+	debian/$(MOZ_APP_NAME)_scalable.png debian/$(MOZ_APP_NAME)_26x26.png debian/$(MOZ_APP_NAME)_40x40.png
+	rm -rf $(DEBDESTDIR)/$(installdir)/*
+	$(NSINSTALL) -D $(DEBDESTDIR)/$(installdir)
+	bunzip2 -c $(DEPTH)/dist/$(PKG_BASENAME)$(PKG_SUFFIX) | $(UNPACK_TAR) -C $(DEBDESTDIR)/$(installdir)
+	rm -rf $(DEBDESTDIR)/$(installdir)/$(MOZ_APP_NAME)/xulrunner	
 	$(NSINSTALL)  debian/$(MOZ_APP_NAME).desktop $(DEBDESTDIR)/usr/share/applications/hildon/
 	$(NSINSTALL) -D $(DEBDESTDIR)/usr/share/dbus-1/services/
 	cp debian/$(MOZ_APP_NAME).service $(DEBDESTDIR)/usr/share/dbus-1/services/org.mozilla.$(MOZ_APP_NAME).service

mobile/installer/debian/fennec.desktop.in

@@ -1,10 +1,11 @@
+#filter substitution
 [Desktop Entry]
 Version=@MOZ_APP_VERSION@
 Encoding=UTF-8
 Name=@MOZ_APP_DISPLAYNAME@
 Comment=@MOZ_APP_DISPLAYNAME@ mobile browser
 GenericName=@MOZ_APP_DISPLAYNAME@
-Exec=/usr/local/fennec/fennec
+Exec=@installdir@/fennec/fennec
 StartupWMClass=Navigator
 StartupNotify=true
 Terminal=false

mobile/installer/debian/fennec.links.in

@@ -1,4 +1,5 @@
-/usr/local/fennec/fennec /usr/bin/fennec
+#filter substitution
+@installdir@/fennec/fennec /usr/bin/fennec
 /usr/share/applications/hildon/fennec.desktop etc/others-menu/0112_fennec.desktop
 
 

mobile/installer/debian/fennec.service.in

@@ -1,4 +1,5 @@
+#filter substitution
 [D-BUS Service]
 Name=Mozilla.@MOZ_APP_DISPLAYNAME@
-Exec=/usr/local/fennec/fennec 
+Exec=@installdir@/fennec/fennec 
 

mobile/makefiles.sh

@@ -56,9 +56,6 @@ mobile/themes/Makefile
 mobile/themes/wince/Makefile
 mobile/installer/debian/changelog
 mobile/installer/debian/compat
-mobile/installer/debian/fennec.desktop
-mobile/installer/debian/fennec.links
-mobile/installer/debian/fennec.service
 mobile/installer/debian/files
 mobile/installer/debian/icon_base64
 mobile/installer/debian/menu