On 11/03/2011 14:34, Vincent Danjean wrote:
> I will send one message per patch I applied with some comment and a last
> one with global comments and questions.
The fifth patch remove a wrongly hack (that seems to be required
for FC6 but that is wrong for Debian) about directories for php.
I also change the installation path for ownet.php
This patch should probably be applied upstream (perhaps with
a detection of FC6 to keep the hack only on this plate-form).
Regards,
Vincent
Fix installation paths for php
Note: on x86_64, libraries are installed in lib, not lib64
If FC7 is broken, a workaround should be added only for FC7. Disabling it for Debian.
--- a/module/swig/php/php.m4
+++ b/module/swig/php/php.m4
@@ -51,8 +51,7 @@
fi
AC_MSG_CHECKING(for PHP extension-dir)
-# FIXME: FC7/x86_64 seems to be broken and return /lib/ instead of /lib64/
-PHPLIBDIR="`$PHPCONFIG --extension-dir 2>/dev/null | sed "s#/lib/#/lib${LIBPOSTFIX}/#g"`"
+PHPLIBDIR="`$PHPCONFIG --extension-dir 2>/dev/null`"
if test ! -z "$PHPLIBDIR"; then
AC_MSG_RESULT($PHPLIBDIR)
else
--- a/module/ownet/php/Makefile.am
+++ b/module/ownet/php/Makefile.am
@@ -2,10 +2,9 @@
EXTRA_DIST = ownet.php examples/bcadd.php examples/ownet_example.php.in examples/ownet_example.php
-install-data-local:
- @INSTALL@ -d ${DESTDIR}${prefix}/bin/
- @INSTALL@ ownet.php ${DESTDIR}${prefix}/bin/
-# @INSTALL@ examples/bcadd.php ${DESTDIR}${prefix}/bin/
+phpdir=${datadir}/php/OWNet
+
+php_DATA=ownet.php
clean-generic:
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Owfs-developers mailing list
Owfs-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/owfs-developers
