Create MacOS bundle in build dir

diff --git a/Makefile.am b/Makefile.am
index 400e064fbd7c651f77bb99ce741be94d20e05ab1..68af730ba2d667c4d34d60aff0347302534ebf4b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -164,6 +164,9 @@ filelist: zip
                fi \
        done
 
+
+### WINDOWS
+
 setup.exe: filelist
        cp $(ISS_SCRIPT) $(INSTALLDIR_WITH_PREFIX)/.
        cd $(INSTALLDIR_WITH_PREFIX) && \
@@ -173,6 +176,8 @@ setup.exe: filelist
        rm -f $(INSTALLDIR_WITH_PREFIX)/$(PACKAGE_WIN32_FILELIST)
        rm -f $(INSTALLDIR_WITH_PREFIX)/$(ISS_SCRIPT)
 
+###
+
 newdate:
        cd gtk && $(MAKE) newdate
 
@@ -190,9 +195,13 @@ Portfile-devel:    $(top_srcdir)/scripts/Portfile-devel.tmpl dist
        sed -e 's/\@VERSION\@/$(LINPHONE_VERSION)/g' \
          -e 's/\@LINPHONE_MD5\@/$(GEN_MD5)/' < $< > $@
 
+
+### MAC
+
 MACAPPNAME=Linphone.app
 MACAPPZIP=$(PACKAGE)-$(VERSION).app.zip
-BUNDLEDIR=$(shell echo "$$HOME/Desktop/$(MACAPPNAME)")
+BUNDLEPREFIX=./
+BUNDLEDIR=$(BUNDLEPREFIX)$(MACAPPNAME)
 LIBICONV_HACK=$(top_builddir)/build/macos/libiconv.2.dylib
 
 $(LIBICONV_HACK):
@@ -203,13 +212,17 @@ bundle: $(LIBICONV_HACK)
        rm -rf $(INSTALLDIR)
        mkdir -p $(INSTALLDIR)
        make install DESTDIR=$(INSTALLDIR)
+       BUNDLE_PREFIX=$(BUNDLEPREFIX) \
        LINPHONE_INSTALL_PREFIX=$(INSTALLDIR_WITH_PREFIX) \
        LIBLINPHONE_INSTALL_PREFIX=$(INSTALLDIR_WITH_PREFIX) \
        gtk-mac-bundler $(PACKAGE_BUNDLE_FILE)
        printf "[Pango]\nModuleFiles=./etc/pango/pango.modules\n" \
        > $(BUNDLEDIR)/Contents/Resources/etc/pango/pangorc 
        cp -f $(LIBICONV_HACK) $(BUNDLEDIR)/Contents/Resources/lib/.
-       cd $(BUNDLEDIR)/.. && rm -f $(MACAPPZIP) && zip -r $(MACAPPZIP) $(MACAPPNAME)
-
+       cd $(BUNDLEDIR)/.. && rm -f $(MACAPPZIP) && zip -r $(MACAPPZIP) $(MACAPPNAME) && cd -
 
+###
+### CLEAN
 
+clean-local:
+       rm -rf $(BUNDLEDIR)

diff --git a/build/macos/linphone.bundle b/build/macos/linphone.bundle
index 59173bdd6abfe264e59972eba3a0ed0227ac0b0f..b4a1419ed15a3d75b83cf70705b1fa50b4b87244 100644 (file)
--- a/build/macos/linphone.bundle
+++ b/build/macos/linphone.bundle
@@ -20,7 +20,7 @@
          app. If you leave out the path, the current directory is
          used. Note the usage of an environment variable here again.
     -->
-    <destination overwrite="yes">${env:HOME}/Desktop</destination>
+    <destination overwrite="yes">${env:BUNDLE_PREFIX}</destination>
 
     <image>
       <!-- Not implemented yet (DMG image). -->