diff options
| author | Brent Eagles <brent@zeroc.com> | 2006-07-13 00:20:47 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2006-07-13 00:20:47 +0000 |
| commit | 9520a5af8fb181504f56799c52940608d6d24f52 (patch) | |
| tree | ebcbd5197441da7724194d716dad877d32637fcb /cpp/makebindist.py | |
| parent | fixing jdk15 build bug (diff) | |
| download | ice-9520a5af8fb181504f56799c52940608d6d24f52.tar.bz2 ice-9520a5af8fb181504f56799c52940608d6d24f52.tar.xz ice-9520a5af8fb181504f56799c52940608d6d24f52.zip | |
changing icephp embedded libpath to refer to the intended Ice installation
Diffstat (limited to 'cpp/makebindist.py')
| -rwxr-xr-x | cpp/makebindist.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/makebindist.py b/cpp/makebindist.py index bf07b67288e..c5220c9b1c7 100755 --- a/cpp/makebindist.py +++ b/cpp/makebindist.py @@ -775,8 +775,11 @@ def makePHPbinary(sources, buildDir, installDir, version, clean): if line.startswith('EXTRA_CXXFLAGS ='): xtraCXXFlags = False print line.rstrip('\n') + ' -DCOMPILE_DL_ICE' - elif platform == 'linux64' and line.startswith('ICE_SHARED_LIBADD'): - print line.rstrip('\n').replace("Ice-%s/lib" % version, "Ice-%s/lib64" % version) + elif line.startswith('ICE_SHARED_LIBADD'): + if platform == 'linux64': + print "ICE_SHARED_LIBADD = -Wl,-rpath,/opt/Ice-%s/lib64 -L/opt/Ice-%s/lib64 -lIce -lSlice -lIceUtil" % (version, version) + else: + print "ICE_SHARED_LIBADD = -Wl,-rpath,/opt/Ice-%s/lib -L/opt/Ice-%s/lib -lIce -lSlice -lIceUtil" % (version, version) else: print line.strip('\n') |