[csw-devel] SF.net SVN: gar:[18027] csw/mgar/pkg/php5/trunk/Makefile

[bdwalton at users.sourceforge.net]

Revision: 18027
          http://gar.svn.sourceforge.net/gar/?rev=18027&view=rev
Author:   bdwalton
Date:     2012-05-17 00:56:42 +0000 (Thu, 17 May 2012)
Log Message:
-----------
php5/trunk: tweak the postgresql configure options to match updated pg packages

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2012-05-16 23:56:24 UTC (rev 18026)
+++ csw/mgar/pkg/php5/trunk/Makefile	2012-05-17 00:56:42 UTC (rev 18027)
@@ -49,12 +49,7 @@
 DISTFILES += httpd-php5.conf
 
 PATCHFILES += 0001-Strip-usr-ucblib-references.patch
-# technically this is only required in the ap2 modulation where we build the
-# postgres stuff, but protect the cgi modulation too
-PATCHFILES_isa-sparcv8-sapi-cgi += 0002-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch
-PATCHFILES_isa-sparcv8-sapi-ap2 += 0002-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch
 
-
 BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils
 BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWlibcurl-dev CSWjpeg
 BUILD_DEP_PKGS += CSWlibpng-dev CSWt1lib CSWxpm CSWlibgdbm-dev CSWlibgmp10
@@ -309,10 +304,10 @@
 # we need the 32-bit version, so we have to force this
 CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix)/bin/mysql_config
 CONFIGURE_ARGS += --with-pdo-odbc=shared,unixODBC,$(prefix)
-CONFIGURE_ARGS += --with-pdo-pgsql=shared,$(prefix)/postgresql
+CONFIGURE_ARGS += --with-pdo-pgsql=shared,$(bindir)/
 CONFIGURE_ARGS += --with-pdo-sqlite=shared,$(prefix)
 CONFIGURE_ARGS += --with-pear=shared
-CONFIGURE_ARGS += --with-pgsql=shared,$(prefix)/postgresql
+CONFIGURE_ARGS += --with-pgsql=shared,$(bindir)/
 CONFIGURE_ARGS += --with-png-dir=$(prefix)
 CONFIGURE_ARGS += --with-pspell=shared,$(prefix)
 CONFIGURE_ARGS += --with-readline=shared,/opt/csw

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.