summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradeshkp <adeshkp@users.noreply.github.com>2018-10-23 16:00:35 -0400
committeradeshkp <adeshkp@users.noreply.github.com>2018-10-23 16:00:35 -0400
commitd9c5e2b8038b80486684c0cd49e9bb03b1b66ab0 (patch)
tree6fcfb649320796f7e1ff190cf66027e3da5771c6
parentb4e78255c0df5ec542a6cc0c0a644e248d4d0c5c (diff)
downloadUXP-d9c5e2b8038b80486684c0cd49e9bb03b1b66ab0.tar
UXP-d9c5e2b8038b80486684c0cd49e9bb03b1b66ab0.tar.gz
UXP-d9c5e2b8038b80486684c0cd49e9bb03b1b66ab0.tar.lz
UXP-d9c5e2b8038b80486684c0cd49e9bb03b1b66ab0.tar.xz
UXP-d9c5e2b8038b80486684c0cd49e9bb03b1b66ab0.zip
Basilisk: Trivial fixes for Mac build
-rw-r--r--application/basilisk/app/Makefile.in2
-rw-r--r--application/basilisk/installer/package-manifest.in4
2 files changed, 5 insertions, 1 deletions
diff --git a/application/basilisk/app/Makefile.in b/application/basilisk/app/Makefile.in
index 4a3b9758e..83d6cb36a 100644
--- a/application/basilisk/app/Makefile.in
+++ b/application/basilisk/app/Makefile.in
@@ -87,8 +87,10 @@ tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME)
rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) $(dist_dest)/Contents/MacOS
cp -RL $(DIST)/branding/firefox.icns $(dist_dest)/Contents/Resources/firefox.icns
cp -RL $(DIST)/branding/document.icns $(dist_dest)/Contents/Resources/document.icns
+ifdef MOZ_UPDATER
$(MKDIR) -p $(dist_dest)/Contents/Library/LaunchServices
mv -f $(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater $(dist_dest)/Contents/Library/LaunchServices
ln -s ../../../../Library/LaunchServices/org.mozilla.updater $(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater
+endif
printf APPLMOZB > $(dist_dest)/Contents/PkgInfo
endif
diff --git a/application/basilisk/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in
index c446d3687..35060ea5e 100644
--- a/application/basilisk/installer/package-manifest.in
+++ b/application/basilisk/installer/package-manifest.in
@@ -35,7 +35,9 @@
#ifdef XP_MACOSX
; Mac bundle stuff
@APPNAME@/Contents/Info.plist
+#ifdef MOZ_UPDATER
@APPNAME@/Contents/Library/LaunchServices
+#endif
@APPNAME@/Contents/PkgInfo
@RESPATH@/firefox.icns
@RESPATH@/document.icns
@@ -114,7 +116,7 @@
@BINPATH@/browser/VisualElements/VisualElements_150.png
@BINPATH@/browser/VisualElements/VisualElements_70.png
#else
-@BINPATH@/@MOZ_APP_NAME@-bin
+@RESPATH@/@MOZ_APP_NAME@-bin
@BINPATH@/@MOZ_APP_NAME@
#endif
@RESPATH@/application.ini