fixup mysqlnd

diff --git a/debian/extramodulelist b/debian/extramodulelist
index 044ca90..ed4740e 100644 (file)
--- a/debian/extramodulelist
+++ b/debian/extramodulelist
@@ -1,5 +1,8 @@
 mysql MySQL mysqli
 mysql MySQL pdo_mysql
+mysqlnd MySQL mysql
+mysqlnd MySQL mysqli
+mysqlnd MySQL pdo_mysql
 interbase InterBase/Firebird pdo_firebird
 common PDO pdo
 odbc ODBC pdo_odbc

diff --git a/debian/modulelist b/debian/modulelist
index b3b713e..64ced5a 100644 (file)
--- a/debian/modulelist
+++ b/debian/modulelist
@@ -8,6 +8,7 @@ intl Internationalisation
 ldap LDAP
 mcrypt MCrypt
 mysql MySQL
+mysqlnd MySQL
 odbc ODBC
 pgsql PostgreSQL
 pspell pspell

diff --git a/debian/rules b/debian/rules
index f64bfad..071f37b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -536,12 +536,17 @@ install: build
                mkdir -p debian/$$i/$${ext}; \
        done; \
        cat debian/modulelist debian/extramodulelist | while read package extname dsoname; do \
+               if [ "$$package" = "mysqlnd" ]; then \
+                       modulepath=cgi-build/modules; \
+               else \
+                       modulepath=debian/libapache2-mod-php5/$${ext}; \
+               fi; \
                if [ -z "$$dsoname" ]; then dsoname=$$package; fi; \
                mkdir -p debian/php5-$$package$${ext}; \
-               chrpath debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \
-               chrpath -d debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \
+               chrpath $${modulepath}/$$dsoname.so; \
+               chrpath -d $${modulepath}/$$dsoname.so; \
                install -m 644 -o root -g root \
-                       debian/libapache2-mod-php5/$${ext}/$$dsoname.so \
+                       $${modulepath}/$$dsoname.so \
                        debian/php5-$$package$${ext}/$$dsoname.so; \
                rm debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \
        done
@@ -551,17 +556,6 @@ install: build
        cp cgi-build/sapi/cgi/usr.bin.php5-cgi debian/php5-cgi/usr/bin/php5-cgi
        cp cli-build/sapi/cli/php.1 debian/php5-cgi/usr/share/man/man1/php5-cgi.1
 
-       # install MySQLnd from CGI build
-       package=mysqlnd
-       for dsoname in mysql mysqlnd mysqli pdo_mysql; do \
-               mkdir -p debian/php5-$$package$${ext}; \
-               chrpath cgi-build/modules/$$dsoname.so; \
-               chrpath -d cgi-build/modules/$$dsoname.so; \
-               install -m 644 -o root -g root \
-                       cgi-build/modules/$$dsoname.so \
-                       debian/php5-$$package$${ext}; \
-       done
-
        # install CLI
        cp cli-build/sapi/cli/php debian/php5-cli/usr/bin/php5
        cp cli-build/sapi/cli/php.1 debian/php5-cli/usr/share/man/man1/php5.1