diff options
| author | Brent Eagles <brent@zeroc.com> | 2006-01-04 12:35:55 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2006-01-04 12:35:55 +0000 |
| commit | a1fb9b6b8c3ab85e4b5d183ad657d3f25fd8d275 (patch) | |
| tree | 505cc42e40289c3f1e94ec19b7778af98138da9c /cpp/RPMTools.py | |
| parent | Fixing dotnet RPM installation issues associated with mono: (diff) | |
| download | ice-a1fb9b6b8c3ab85e4b5d183ad657d3f25fd8d275.tar.bz2 ice-a1fb9b6b8c3ab85e4b5d183ad657d3f25fd8d275.tar.xz ice-a1fb9b6b8c3ab85e4b5d183ad657d3f25fd8d275.zip | |
Modified pkgconfig file editing to hard code /usr as the mono_home. The
reason for this change is that the RPM install always assumes /usr
anyways so it makes no sense to try to be clever here. It is
potentially worse than being 'too clever for no reason', we could end
up setting the pkgconfig files to point to locations other than where
the assemblies were installed.
Diffstat (limited to 'cpp/RPMTools.py')
| -rw-r--r-- | cpp/RPMTools.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/cpp/RPMTools.py b/cpp/RPMTools.py index 32d4e53cfd3..a9967ae89e9 100644 --- a/cpp/RPMTools.py +++ b/cpp/RPMTools.py @@ -222,15 +222,11 @@ class Subpackage(Package): class DotNetPackage(Subpackage): def writePostInstall(self, ofile, version, intVersion, installDir): ofile.write('\n%ifarch noarch\n') - ofile.write('''x=`which mono 2> /dev/null | grep mono` -if test ! "x$x" == "x"; -then - mono_home=`dirname $x | sed -e "s/\/bin$//" | sed -e "s/\//\\x5c\\x5c\\x2f/g"` - for f in icecs glacier2cs iceboxcs icegridcs icepatch2cs icestormcs; - do - sed -i.bak -e "s/^mono_root.*$/mono_root = $mono_home/" /usr/lib/pkgconfig/$f.pc ; - done -fi + ofile.write(''' +for f in icecs glacier2cs iceboxcs icegridcs icepatch2cs icestormcs; +do + sed -i.bak -e "s/^mono_root.*$/mono_root = \/usr/" /usr/lib/pkgconfig/$f.pc ; +done ''') ofile.write('\n%endif\n') |