Permalink
Browse files

* 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
  • Loading branch information...
1 parent d4c9db7 commit fd922aabc2d91034533599122535e3de85712b6c Wade Berrier committed Oct 29, 2005
Showing with 46 additions and 23 deletions.
  1. +6 −0 ChangeLog
  2. +5 −0 configure.in
  3. +5 −5 mint.pc.in
  4. +4 −5 mono.pc.in
  5. +1 −1 scripts/Makefile.am
  6. +7 −4 scripts/mono-find-provides.in
  7. +7 −4 scripts/mono-find-requires.in
  8. +2 −2 scripts/mono-nunit.pc.in
  9. +4 −1 scripts/mono-service.in
  10. +5 −1 scripts/script.in
View
@@ -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.
View
@@ -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
View
@@ -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@
View
@@ -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
View
@@ -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 \
@@ -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;
@@ -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;
View
@@ -1,9 +1,9 @@
-prefix=@prefix@
+prefix=${pcfiledir}/../..
exec_prefix=${prefix}
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
+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
View
@@ -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 &
View
@@ -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 "$@"

0 comments on commit fd922aa

Please sign in to comment.