diff options
author | Brent Eagles <brent@zeroc.com> | 2006-07-12 16:29:48 +0000 |
---|---|---|
committer | Brent Eagles <brent@zeroc.com> | 2006-07-12 16:29:48 +0000 |
commit | 0335b06da8806559cd87d2326c1171b125564cfa (patch) | |
tree | bec9357215a0daa533926f09dd1f729ed197a284 /cpp/RPMTools.py | |
parent | adding STLPort dialog pane and fixing generated docs for third party (diff) | |
download | ice-0335b06da8806559cd87d2326c1171b125564cfa.tar.bz2 ice-0335b06da8806559cd87d2326c1171b125564cfa.tar.xz ice-0335b06da8806559cd87d2326c1171b125564cfa.zip |
fix missing Makefile changes on php RPM and openssl library placement
Diffstat (limited to 'cpp/RPMTools.py')
-rw-r--r-- | cpp/RPMTools.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cpp/RPMTools.py b/cpp/RPMTools.py index f9b3a830078..0d1432d6a5c 100644 --- a/cpp/RPMTools.py +++ b/cpp/RPMTools.py @@ -692,7 +692,13 @@ export LD_LIBRARY_PATH=$RPM_BUILD_DIR/Ice-%{version}/lib:$LD_LIBRARY_PATH gmake OPTIMIZE=yes ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} RPM_BUILD_ROOT=$RPM_BUILD_ROOT cd $RPM_BUILD_DIR/php-5.1.4 ./configure --with-ice=shared,$RPM_BUILD_DIR/Ice-%{version} -sed -i -e 's/^EXTRA_CXXFLAGS.*$/EXTRA_CXXFLAGS = -DCOMPILE_DL_ICE/' $RPM_BUILD_DIR/php-5.1.4/Makefile +cp Makefile Makefile.tmp +echo "EXTRA_CXXFLAGS= -DCOMPILE_DL_ICE" > Makefile +cat Makefile.tmp >> Makefile +if test "$RPM_ARCH" == "x86_64"; +then + sed -i -e 's/Ice-%{version}\/lib/Ice-%{version}\/lib64/g' Makefile ; +fi gmake """) |