summaryrefslogtreecommitdiff
path: root/devel/ice/files/patch-php-config-Make.rules.php
blob: 5b589e114f352c35d04ef424731ae84a14e278e1 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
--- php/config/Make.rules.php.orig	2019-08-12 19:54:18 UTC
+++ php/config/Make.rules.php
@@ -81,13 +81,8 @@ ifeq ($(findstring /php/test/,$(abspath $(MAKEFILE_LIS
         $(error $(PHP_CONFIG) not found review your PHP installation and ensure $(PHP_CONFIG) is in your PATH)
     endif
 
-    ifndef usr_dir_install
-        install_phpdir	= $(prefix)/php
-        install_libdir  	= $(prefix)/php
-    else
-        install_phpdir  	= $(prefix)/share/php
-        install_libdir  	= $(shell $(PHP_CONFIG) --extension-dir)
-    endif
+    install_phpdir         = $(prefix)/share/pear
+    install_libdir         = $(prefix)/lib/php/$(PHP_EXT_DIR)
 endif
 
 ifdef ice_src_dist
@@ -145,7 +140,8 @@ else
 endif
 
 ifeq ($(installphplib),)
-    installphplib	= $(INSTALL) $(1) $(2); \
+    installphplib	= mkdir -p $(2) ; \
+			  $(INSTALL) $(1) $(2); \
 			  chmod a+rx $(2)/$(notdir $(1))
 endif