Make wrappers and .pc files relocatable.

Also bump version

svn path=/branches/mono-1-1-7/mono/; revision=52334

9 files changed, 39 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 7cc92b54cd2..5add965a8f4 100644
--- 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 
+	script2.in.  Make all the wrappers relocatable.
+
 2005-05-09  Ben Maurer  <bmaurer@ximian.com>
 
 	* configure.in: 1.1.7.1
diff --git a/configure.in b/configure.in
index fb38acbcd80..9ef6598e4fd 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
 m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,1.1.7.11)
+AM_INIT_AUTOMAKE(mono,1.1.7.12)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -41,6 +41,10 @@ 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 004bb0f7162..9486c6f1a7f 100644
--- 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 b837aa6d784..b25b12f1407 100644
--- a/mono.pc.in
+++ b/mono.pc.in
@@ -1,7 +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
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index ddca4cce9b5..ca2155e1146 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -56,8 +56,8 @@ mono_one_instdir = $(shell cygpath -m $(libdir))/mono/1.0
 mono_two_instdir = $(shell cygpath -m $(libdir))/mono/2.0
 else
 plat_bindir = $(bindir)
-mono_one_instdir = $(prefix)/lib/mono/1.0
-mono_two_instdir = $(prefix)/lib/mono/2.0
+mono_one_instdir = $$d/../lib/mono/1.0
+mono_two_instdir = $$d/../lib/mono/2.0
 endif
 
 REWRITE = sed \
diff --git a/scripts/mono-nunit.pc.in b/scripts/mono-nunit.pc.in
index fe9f41c0a6f..54479172eac 100644
--- 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 27bf6f917f2..f30cfdfe70e 100644
--- a/scripts/mono-service.in
+++ b/scripts/mono-service.in
@@ -1,4 +1,7 @@
 #!/bin/sh
+a=`which "$0"`
+d=`which "$a"`
+
 args="$@"
 assembly=
 while test x$1 != x; do
@@ -29,4 +32,5 @@ if test x$assembly = x; then
 fi
 
 export MONO_DISABLE_SHM=1
-exec @bindir@/@mono_interp@ @mono_one_instdir@/@exe_file@ $args </dev/null >& /dev/null &
+exec $d/@mono_interp@ @mono_one_instdir@/@exe_file@ $args </dev/null >& /dev/null &
+
diff --git a/scripts/script.in b/scripts/script.in
index e68eb084cb3..bdda20889e1 100644
--- a/scripts/script.in
+++ b/scripts/script.in
@@ -1,2 +1,6 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/@exe_file@ "$@"
+
+a=`which "$0"`
+d=`dirname "$a"`
+
+exec $d/@mono_interp@ @mono_one_instdir@/@exe_file@ "$@"
diff --git a/scripts/script2.in b/scripts/script2.in
index 0b594f30aca..77a8c00ee9b 100644
--- a/scripts/script2.in
+++ b/scripts/script2.in
@@ -1,2 +1,6 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @mono_two_instdir@/@exe_file@ "$@"
+
+a=`which "$0"`
+d=`dirname "$a"`
+
+exec $d/@mono_interp@ @mono_two_instdir@/@exe_file@ "$@"