diff --git a/Makefile.in b/Makefile.in index cffddcd..0089e67 100644 --- a/Makefile.in +++ b/Makefile.in @@ -68,6 +68,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ INSTALL_DATA=@INSTALL_DATA@ RPMBUILD=@RPMBUILD@ DPKGBUILD=@DPKGBUILD@ +MACBUNDLER=@MACBUNDLER@ CONVERT=@CONVERT@ MSGCAT=@MSGCAT@ MSGINIT=@MSGINIT@ @@ -219,6 +220,12 @@ ifneq ($(DPKGBUILD),no) @$(DPKGBUILD) -rfakeroot -uc -us endif +ifneq ($(MACBUNDLER),no) + @rm -fr .bin/pw3270.app + @$(MACBUNDLER) mac/pw3270.bundle +endif + + $(PACKAGE_NAME).po: $(TMPDIR)/$(PACKAGE_NAME).pot @echo " INIT `basename $@`" @$(MSGINIT) --no-translator -o $@ --locale=en_US -i $^ @@ -339,8 +346,6 @@ clean: @rm -fr .obj @rm -fr .bin @rm -fr .tmp - @find . -type d -name .bin -exec echo -e rm -fr "{}\n" \; | sh - @find . -type d -name .obj -exec echo -e rm -fr "{}\n" \; | sh @find . -name "*~" -exec rm -f {} \; @rm -f $(PACKAGE_NAME).po @make -C src/lib3270 clean diff --git a/configure.ac b/configure.ac index 0af4fca..e38360b 100644 --- a/configure.ac +++ b/configure.ac @@ -68,6 +68,8 @@ AC_PATH_TOOL([MAKENSIS], [makensis], [no]) AC_PATH_TOOL([WINDRES], [windres], [no]) AC_PATH_TOOL([DBUSBINDINGTOOL],[dbus-binding-tool],[no]) +AC_PATH_TOOL([MACBUNDLER],[gtk-mac-bundler], [no]) + AC_CHECK_PROGS(GZIP,[gzip],no) export GZIP; if test $GZIP = "no" ; then @@ -143,7 +145,7 @@ case "$host" in *-apple-*) DBG_LDFLAGS="-L.bin/Debug/lib" - RLS_LDFLAGS="-L.bin/Release/lib -Wl,--strip-all" + RLS_LDFLAGS="-L.bin/Release/lib" LDSOFLAGS="" DLLDIR="/lib" DBGRPATH="" @@ -577,4 +579,3 @@ AC_CONFIG_FILES([ dnl Output the generated config.status script. AC_OUTPUT - diff --git a/mac/pw3270.bundle b/mac/pw3270.bundle index c9c750b..e5afefb 100644 --- a/mac/pw3270.bundle +++ b/mac/pw3270.bundle @@ -53,7 +53,7 @@ ${prefix:bin}/pw3270 - ${prefix:bin}/lib/*.so.5.0 + ${prefix:bin}/lib/*.so.5.0 - ${project}/Giggle.icns - + ${project}/pw3270.icns +