install php bindings in php-preferred location

diff --git a/configure.ac b/configure.ac
index 1298b0e0c884fd1a6abd8e4673daf3a136a5fc15..048c0debdce80b3e6c06b7292423d7f6605a4a08 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -795,6 +795,7 @@ PHP_INCLUDES="-I/usr/include/php5 -I/usr/include/php5/main -I/usr/include/php5/Z
 else
 PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
 fi
+PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php"
 PHP_LIBS=
 save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
@@ -803,6 +804,7 @@ AC_CHECK_HEADER(zend.h,,[
   PHP=
   ])
 CPPFLAGS=$save_CPPFLAGS
+AC_SUBST(PHP_INSTALL_DIR)
 AC_SUBST(PHP_INCLUDES)
 AC_SUBST(PHP_LIBS)
 fi

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 6586b43097d32476bcea288bcbeac29cff97c788..478268398acf3fd817e03f24f6ea99a31825e89d 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -111,7 +111,7 @@ $(PERL_data): gv_perl.cpp
 gv_perl.cpp: gv.i
        $(SWIG) -c++ -perl -o gv_perl.cpp $(srcdir)/gv.i
 
-pkgphpdir = $(pkglibdir)/php
+pkgphpdir = @PHP_INSTALL_DIR@
 PHP_data = gv.php php_gv.h
 nodist_libgv_php_la_SOURCES = gv_php.cpp $(PHP_data)
 libgv_php_la_SOURCES = $(BASESOURCES) gv_php_init.cpp

diff --git a/tclpkg/gv/demo/modgraph.php b/tclpkg/gv/demo/modgraph.php
index c26653f936ea039dce57b889b97a33e014183a03..2b6640e222895b9854265206ca804efcd8d2a845 100755 (executable)
--- a/tclpkg/gv/demo/modgraph.php
+++ b/tclpkg/gv/demo/modgraph.php
@@ -1,9 +1,5 @@
 #!/usr/bin/php
 <?
-#FIXME  - I don't know how to extend php's paths.  Needs:
-#   ln -s /usr/lib64/graphviz/php/libgv_php.so /usr/lib64/php/modules/gv.so
-#   ln -s /usr/lib64/graphviz/php/php/gv.php /usr/share/php/gv.php
-
 include("gv.php");
 
 # display the kernel module dependencies