diff options
author | Joe George <joe@zeroc.com> | 2017-06-22 16:12:17 -0400 |
---|---|---|
committer | Joe George <joe@zeroc.com> | 2017-06-22 16:31:48 -0400 |
commit | c1a714d3d6bc8c1a818c4675465ba1760e3ce9c3 (patch) | |
tree | 4d55ee3a83b86941d3aaa5901d06c1abed161e9a | |
parent | Fix for macOS bindists (ICE-8139) (diff) | |
download | ice-c1a714d3d6bc8c1a818c4675465ba1760e3ce9c3.tar.bz2 ice-c1a714d3d6bc8c1a818c4675465ba1760e3ce9c3.tar.xz ice-c1a714d3d6bc8c1a818c4675465ba1760e3ce9c3.zip |
ICE-8143 - Rename IcePHP.so to ice.so
-rw-r--r-- | php/BuildInstructionsLinuxMacOS.md | 4 | ||||
-rw-r--r-- | php/src/php5/Makefile.mk | 2 | ||||
-rw-r--r-- | php/src/php7/Makefile.mk | 2 | ||||
-rw-r--r-- | scripts/Util.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/php/BuildInstructionsLinuxMacOS.md b/php/BuildInstructionsLinuxMacOS.md index 32beb861809..4e9472d9c84 100644 --- a/php/BuildInstructionsLinuxMacOS.md +++ b/php/BuildInstructionsLinuxMacOS.md @@ -54,7 +54,7 @@ you can create a file in `/etc/php.d` that contains the directive to load the Ice extension. For example, create the file `/etc/php.d/ice.ini` containing the following line: - extension = IcePHP.so + extension = ice.so If PHP does not support the `/etc/php.d` directory, determine the path name of PHP's configuration file as reported by the `php -i` command: @@ -63,7 +63,7 @@ PHP's configuration file as reported by the `php -i` command: Open the configuration file and append the following line: - extension = IcePHP.so + extension = ice.so You can verify that PHP is loading the Ice extension by running the command shown below: diff --git a/php/src/php5/Makefile.mk b/php/src/php5/Makefile.mk index 74b570f96b4..30c3ce087fd 100644 --- a/php/src/php5/Makefile.mk +++ b/php/src/php5/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries := IcePHP IcePHP_target := php-module -IcePHP_targetname := IcePHP +IcePHP_targetname := ice IcePHP_targetdir := lib IcePHP_installdir := $(install_phplibdir) IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/src $(php_cpp_includes) $(php_cppflags) diff --git a/php/src/php7/Makefile.mk b/php/src/php7/Makefile.mk index aa1ecea31ba..69caa06d9a7 100644 --- a/php/src/php7/Makefile.mk +++ b/php/src/php7/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries := IcePHP IcePHP_target := php-module -IcePHP_targetname := IcePHP +IcePHP_targetname := ice IcePHP_targetdir := lib IcePHP_installdir := $(install_phplibdir) IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/src $(php_cpp_includes) $(php_cppflags) diff --git a/scripts/Util.py b/scripts/Util.py index 34a63f3086e..5156a14bdc0 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -3140,7 +3140,7 @@ class PhpMapping(CppBasedClientMapping): extensionDir = os.path.join(self.path, "lib", buildPlatform, config) includePath = self.getLibDir(process, current) else: - extension = "IcePHP.so" + extension = "ice.so" extensionDir = self.getLibDir(process, current) includePath = "{0}/{1}".format(current.driver.getIceDir(self, current), "php" if useBinDist else "lib") |