SVN Commit by dpage: r4758 - in trunk/pgadmin3: . xtra xtra/pgagent

Author: dpage
Date: 2005-11-25 08:44:44 +0000 (Fri, 25 Nov 2005)
New Revision: 4758

Modified:
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/xtra/Makefile.am
   trunk/pgadmin3/xtra/pgagent/Makefile.am
Log:
Don't include pgAgent in the Mac OSX bundle
[Florian G. Pflug]

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2005-11-25 08:42:19 UTC (rev 4757)
+++ trunk/pgadmin3/CHANGELOG.txt    2005-11-25 08:44:44 UTC (rev 4758)
@@ -18,7 +18,8 @@
 </ul>
 <br>
 <ul>
-    <li>2005-11-20 FGP 1.4.1  Include pg_dump/pg_restore in the Mac OSX bundle
+    <li>2005-11-25 FGP 1.4.1  Don't include pgAgent in the Mac OSX bundle
+    <li>2005-11-25 FGP 1.4.1  Include pg_dump/pg_restore in the Mac OSX bundle
     <li>2005-11-20 DP  1.4.1  Use a proper 'Save As' style dialogue for selecting backup files
     <li>2005-11-20 AP  1.4.1  Don't show pk hint when editing view
     <li>2005-11-20 AP  1.4.1  Add missing NO ACTION FK constraint

Modified: trunk/pgadmin3/xtra/Makefile.am
===================================================================
--- trunk/pgadmin3/xtra/Makefile.am    2005-11-25 08:42:19 UTC (rev 4757)
+++ trunk/pgadmin3/xtra/Makefile.am    2005-11-25 08:44:44 UTC (rev 4758)
@@ -7,8 +7,12 @@
 # Makefile - Makefile for *nix systems
 ##############################################################################

+if !APPBUNDLE
+
 SUBDIRS = pgagent

+endif
+
 # Note: We cannot add a Makefile to the admin directory as it already
 #       contains one to be used as part of the PostreSQL contrib build
 #    system. Instead, we'll add the files in that directory here.

Modified: trunk/pgadmin3/xtra/pgagent/Makefile.am
===================================================================
--- trunk/pgadmin3/xtra/pgagent/Makefile.am    2005-11-25 08:42:19 UTC (rev 4757)
+++ trunk/pgadmin3/xtra/pgagent/Makefile.am    2005-11-25 08:44:44 UTC (rev 4758)
@@ -37,24 +37,11 @@
 AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -Wno-non-virtual-dtor -I$(srcdir)/include
 AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -I$(srcdir)/include

-# Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
-# for non-APPBUNDLE cases.
-install-exec-hook:
+install-data-local:
+    $(install_sh) -c -m 644 pgagent.sql $(DESTDIR)/$(pkgdatadir)/pgagent.sql

 else

-AM_CXXFLAGS = -Wall -Wno-non-virtual-dtor -I$(srcdir)/include
-AM_CPPFLAGS = -Wall -Wno-non-virtual-dtor -I$(srcdir)/include
-AM_CFLAGS = -Wall -I$(srcdir)/include
-install-exec-hook:
-        cd $(bindir) ;\
-        mv pgagent tmp ;\
-        mv tmp pgagent ;\
-        if test "$(pg_debug_build)" = "no"; then \
-                strip pgagent ;\
-        fi
+install-data-local:

 endif
-
-install-data-local:
-    $(install_sh) -c -m 644 pgagent.sql $(DESTDIR)/$(pkgdatadir)/pgagent.sql