* mono.pc.in, mint.pc.in, configure.in: Make these relocatable.

* scripts: Makefile.am mono-nunit.pc.in script.in mono-service.in
Make all the wrappers relocatable.

svn path=/trunk/mono/; revision=52364

diff --git a/ChangeLog b/ChangeLog
index 267316ab6429e5c866da2b8cc2a482999be600c9..b883985a965db526b01c5dede699c06026fefccc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-28  Wade Berrier <wberrier@novell.com>
+
+       * mono.pc.in, mint.pc.in, configure.in: Make these relocatable.
+       * scripts: Makefile.am mono-nunit.pc.in script.in mono-service.in 
+       Make all the wrappers relocatable.
+
 2005-10-21  Zoltan Varga  <vargaz@gmail.com>
 
        * configure.in: Add test for execinfo.h.

diff --git a/configure.in b/configure.in
index b7f8b3225fc7a03a7b80dc47df10fc4828a41d06..8ced2148af936650b815c5349f06243869832c14 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -42,6 +42,11 @@ libmono_ldflags=""
 AC_SUBST(libmono_cflags)
 AC_SUBST(libmono_ldflags)
 
+# Variable to have relocatable .pc files (lib, or lib64)
+reloc_libdir=`basename ${libdir}`
+AC_SUBST(reloc_libdir)
+
+
 dnl if linker handles the version script
 no_version_script=no
 

diff --git a/mint.pc.in b/mint.pc.in
index 004bb0f7162568b738835f0923169ceb4e5c422a..9486c6f1a7f667907bf25a1e1ab0ee6fa11ebb38 100644 (file)
--- a/mint.pc.in
+++ b/mint.pc.in
@@ -1,12 +1,12 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+prefix=${pcfiledir}/../..
+exec_prefix=${pcfiledir}/../..
+libdir=${prefix}/lib
+includedir=${prefix}/include
 
 
 Name: Mono Interpreter
 Description: Mono Interpreter Runtime
 Version: @VERSION@
 Requires: glib-2.0 gmodule-2.0 gthread-2.0
-Libs: -L${libdir} -lmint @libmono_ldflags@ @ICU_LIBS@ -lm
+Libs: -L${libdir} -lmint @libmono_ldflags@ -lm
 Cflags: -I${includedir} @libmono_cflags@

diff --git a/mono.pc.in b/mono.pc.in
index b837aa6d784cc3a6088e97a07a54cb6a0c06696e..1475699031319e589f8cb6dd1014d52940f63154 100644 (file)
--- a/mono.pc.in
+++ b/mono.pc.in
@@ -1,8 +1,7 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
+prefix=${pcfiledir}/../..
+exec_prefix=${pcfiledir}/../..
+libdir=${prefix}/@reloc_libdir@
+includedir=${prefix}/include
 
 Name: Mono
 Description: Mono Runtime

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 74cc72969d3eb3d42c092be36e505339267e4a49..79bc1b50ab05cb31844a2d12f6ba078c43f19670 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -65,7 +65,7 @@ plat_bindir = $(shell cygpath -m $(libdir))
 mono_instdir = $(shell cygpath -m $(libdir))/mono
 else
 plat_bindir = $(bindir)
-mono_instdir = $(prefix)/lib/mono
+mono_instdir = $$d/../lib/mono
 endif
 
 REWRITE = sed \

diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in
index b144b34e9de626b6c2ddfa4e425cec12b4063757..7f677202006328bbaf90c3e5f58c551225fd48a2 100644 (file)
--- a/scripts/mono-find-provides.in
+++ b/scripts/mono-find-provides.in
@@ -12,12 +12,15 @@ IFS=$'\n'
 filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/'))
 monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
 
+a=`which "$0"`
+d=`dirname "$a"`
+
 # Set the prefix, unless it is overriden (used when building mono rpms)
-: ${prefix=@prefix@}
+: ${prefix=$d/..}
 
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-bindir=@bindir@
+exec_prefix=$d/..
+libdir=$prefix/@reloc_libdir@
+bindir=$d
 
 [ -x $bindir/monodis ] || exit 0;
 [ -f $libdir/libmono.so ] || exit 0;

diff --git a/scripts/mono-find-requires.in b/scripts/mono-find-requires.in
index 46c939ef97068305a4668a2c7a5b9681f1aa064c..446d9fcfd2da452347b4bf3c8a7340dff66bb6e9 100644 (file)
--- a/scripts/mono-find-requires.in
+++ b/scripts/mono-find-requires.in
@@ -12,12 +12,15 @@ IFS=$'\n'
 filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/'))
 monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
 
+a=`which "$0"`
+d=`dirname "$a"`
+
 # Set the prefix, unless it is overriden (used when building mono rpms)
-: ${prefix=@prefix@}
+: ${prefix=$d/..}
 
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-bindir=@bindir@
+exec_prefix=$d/..
+libdir=$prefix/@reloc_libdir@
+bindir=$d
 
 [ -x $bindir/monodis ] || exit 0;
 [ -f $libdir/libmono.so ] || exit 0;

diff --git a/scripts/mono-nunit.pc.in b/scripts/mono-nunit.pc.in
index fe9f41c0a6f6d0faf5ced89dc6d3c075d47adb82..54479172eac4a9491f429318d27796e96e69852d 100644 (file)
--- a/scripts/mono-nunit.pc.in
+++ b/scripts/mono-nunit.pc.in
@@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 
@@ -6,4 +6,4 @@ libdir=${exec_prefix}/lib
 Name: Mono NUnit
 Description: Mono's version of NUnit
 Version: @VERSION@
-Libs: -r:${libdir}/mono/1.0/nunit.core.dll -r:${libdir}/mono/1.0/nunit.framework.dll -r:${libdir}/mono/1.0/nunit.util.dll
\ No newline at end of file
+Libs: -r:${libdir}/mono/1.0/nunit.core.dll -r:${libdir}/mono/1.0/nunit.framework.dll -r:${libdir}/mono/1.0/nunit.util.dll

diff --git a/scripts/mono-service.in b/scripts/mono-service.in
index 25b789902c47f9701726dcd26f6bdb6f22510013..950c2f66cb47d5eb1853fe3ae547e53a93b852d6 100644 (file)
--- a/scripts/mono-service.in
+++ b/scripts/mono-service.in
@@ -1,4 +1,7 @@
 #!/bin/sh
+a=`which "$0"`
+d=`dirname "$a"`
+
 args="$@"
 assembly=
 while test x$1 != x; do
@@ -29,4 +32,4 @@ if test x$assembly = x; then
 fi
 
 export MONO_DISABLE_SHM=1
-exec @bindir@/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name@.exe $args </dev/null >& /dev/null &
+exec $d/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name@.exe $args </dev/null >& /dev/null &

diff --git a/scripts/script.in b/scripts/script.in
index ef0e2bcffeac50a127d4e4064ef359fc57edbbb7..8952ac6d6ea5b0ec066abcde744659bbe11173d2 100644 (file)
--- a/scripts/script.in
+++ b/scripts/script.in
@@ -1,2 +1,6 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name@.exe "$@"
+
+a=`which "$0"`
+d=`dirname "$a"`
+
+exec $d/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name@.exe "$@"