SVN Commit by dpage: r4769 - in branches/REL-1_4_0_PATCHES/pgadmin3: . pkg/mac

Author: dpage
Date: 2005-12-01 08:39:38 +0000 (Thu, 01 Dec 2005)
New Revision: 4769

Modified:
branches/REL-1_4_0_PATCHES/pgadmin3/acinclude.m4
branches/REL-1_4_0_PATCHES/pgadmin3/pkg/mac/Makefile.am
Log:
I just noted that the OSX-build of the 1.4 build is broken due to the inclusion of the pg_dump-in-appbundle patch. The patch assumes that PG_CONFIG is available inside pkg/mac/Makefile.am, but the 1.4 buildsystem doesn't know about PG_CONFIG.

Please apply the attached patch. It's the most primitiv patch possible - it adds AC_SUBST(LIBPQ_HOME) to acinclude.m4, and then hopes that LIBPQ_HOME/bin/pg_{dump|restore} exists. It's not pretty, but at least it makes building possible again ;-)
[Florian G. Pflug]

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/acinclude.m4
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/acinclude.m4 2005-11-30 22:27:05 UTC (rev 4768)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/acinclude.m4 2005-12-01 08:39:38 UTC (rev 4769)
@@ -164,6 +164,7 @@
fi
fi
])
+AC_SUBST(LIBPQ_HOME)

#
# Check for libpq libraries and headers

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/pkg/mac/Makefile.am
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/pkg/mac/Makefile.am 2005-11-30 22:27:05 UTC (rev 4768)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/pkg/mac/Makefile.am 2005-12-01 08:39:38 UTC (rev 4769)
@@ -24,7 +24,7 @@
$(install_sh_DATA) "sql.icns" "$(bundledir)/Contents/Resources/sql.icns"
$$($(WX_CONFIG) --rezflags | sed 's/-t[[:space:]]*APPL//') \
"$(bundledir)/Contents/Resources/pgAdmin3.rsrc" -useDF
- $(install_sh_PROGRAM) "$$($(PG_CONFIG) --bindir)/pg_dump" "$(bundledir)/Contents/SharedSupport/helper/pg_dump"
- $(install_sh_PROGRAM) "$$($(PG_CONFIG) --bindir)/pg_restore" "$(bundledir)/Contents/SharedSupport/helper/pg_restore"
+ $(install_sh_PROGRAM) "$(LIBPQ_HOME)/bin/pg_dump" "$(bundledir)/Contents/SharedSupport/helper/pg_dump"
+ $(install_sh_PROGRAM) "$(LIBPQ_HOME)/bin/pg_restore" "$(bundledir)/Contents/SharedSupport/helper/pg_restore"
./complete-bundle.sh "$(bundledir)"
endif