X-Git-Url: http://sjero.net/git/?p=linphone;a=blobdiff_plain;f=Makefile.am;h=36466ab9eea510178a15a584255a085de5c31d2a;hp=507e6f4dc8e209d29720369dbf30b232ce9b0c30;hb=5ddf9069f0c5f487b65ef5b64dbd19a56066b350;hpb=beb2d66e21d2b939e221f8ae2043ab8dfec97681 diff --git a/Makefile.am b/Makefile.am index 507e6f4d..36466ab9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,17 +48,17 @@ ISCC=ISCC.exe PACKAGE_WIN32_FILELIST=$(PACKAGE)-win32.filelist PACKAGE_BUNDLE_FILE=$(top_srcdir)/build/macos/$(PACKAGE).bundle -EXTRA_DIST = config.rpath BUGS linphone.kdevelop \ - README.arm \ - README.mingw \ - README.macos \ - autogen.sh \ - linphone.spec \ - linphone.spec.in \ - $(GTK_FILELIST) \ - gen-gtkfilelist.sh \ - $(LINPHONEDEPS_FILELIST) \ - $(ISS_SCRIPT).in +EXTRA_DIST = BUGS \ + README.arm \ + README.mingw \ + README.macos \ + autogen.sh \ + linphone.spec \ + linphone.spec.in \ + $(GTK_FILELIST) \ + gen-gtkfilelist.sh \ + $(LINPHONEDEPS_FILELIST) \ + $(ISS_SCRIPT).in DISTCLEANFILES= $(ISS_SCRIPT) $(PACKAGE_WIN32_FILELIST) @@ -220,7 +220,7 @@ bundle: $(LIBICONV_HACK) printf "[Pango]\nModuleFiles=./etc/pango/pango.modules\n" \ > $(BUNDLEDIR)/Contents/Resources/etc/pango/pangorc cp -f $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig - sed -e 's:@executable_path/../Resources:../..:g' $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig > $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules + sed -e 's:@executable_path.*/::g' $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig > $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules cp -f $(LIBICONV_HACK) $(BUNDLEDIR)/Contents/Resources/lib/. cd $(BUNDLEDIR)/.. && rm -f $(MACAPPZIP) && zip -r $(MACAPPZIP) $(MACAPPNAME) && cd -