Author: wade
Date: 2005-10-28 12:36:28 -0400 (Fri, 28 Oct 2005)
New Revision: 52334
Modified:
branches/mono-1-1-7/mono/ChangeLog
branches/mono-1-1-7/mono/configure.in
branches/mono-1-1-7/mono/mint.pc.in
branches/mono-1-1-7/mono/mono.pc.in
branches/mono-1-1-7/mono/scripts/Makefile.am
branches/mono-1-1-7/mono/scripts/mono-nunit.pc.in
branches/mono-1-1-7/mono/scripts/mono-service.in
branches/mono-1-1-7/mono/scripts/script.in
branches/mono-1-1-7/mono/scripts/script2.in
Log:
Make wrappers and .pc files relocatable.
Also bump version
Modified: branches/mono-1-1-7/mono/ChangeLog
===================================================================
--- branches/mono-1-1-7/mono/ChangeLog 2005-10-28 16:34:39 UTC (rev 52333)
+++ branches/mono-1-1-7/mono/ChangeLog 2005-10-28 16:36:28 UTC (rev 52334)
@@ -1,3 +1,9 @@
+2005-10-28 Wade Berrier <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* configure.in: 1.1.7.1
Modified: branches/mono-1-1-7/mono/configure.in
===================================================================
--- branches/mono-1-1-7/mono/configure.in 2005-10-28 16:34:39 UTC (rev
52333)
+++ branches/mono-1-1-7/mono/configure.in 2005-10-28 16:36:28 UTC (rev
52334)
@@ -6,7 +6,7 @@
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 @@
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
Modified: branches/mono-1-1-7/mono/mint.pc.in
===================================================================
--- branches/mono-1-1-7/mono/mint.pc.in 2005-10-28 16:34:39 UTC (rev 52333)
+++ branches/mono-1-1-7/mono/mint.pc.in 2005-10-28 16:36:28 UTC (rev 52334)
@@ -1,12 +1,12 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+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@
Modified: branches/mono-1-1-7/mono/mono.pc.in
===================================================================
--- branches/mono-1-1-7/mono/mono.pc.in 2005-10-28 16:34:39 UTC (rev 52333)
+++ branches/mono-1-1-7/mono/mono.pc.in 2005-10-28 16:36:28 UTC (rev 52334)
@@ -1,7 +1,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+prefix=${pcfiledir}/../..
+exec_prefix=${pcfiledir}/../..
+libdir=${prefix}/@reloc_libdir@
+includedir=${prefix}/include
Name: Mono
Modified: branches/mono-1-1-7/mono/scripts/Makefile.am
===================================================================
--- branches/mono-1-1-7/mono/scripts/Makefile.am 2005-10-28 16:34:39 UTC
(rev 52333)
+++ branches/mono-1-1-7/mono/scripts/Makefile.am 2005-10-28 16:36:28 UTC
(rev 52334)
@@ -56,8 +56,8 @@
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 \
Modified: branches/mono-1-1-7/mono/scripts/mono-nunit.pc.in
===================================================================
--- branches/mono-1-1-7/mono/scripts/mono-nunit.pc.in 2005-10-28 16:34:39 UTC
(rev 52333)
+++ branches/mono-1-1-7/mono/scripts/mono-nunit.pc.in 2005-10-28 16:36:28 UTC
(rev 52334)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@
+prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
@@ -6,4 +6,4 @@
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
Modified: branches/mono-1-1-7/mono/scripts/mono-service.in
===================================================================
--- branches/mono-1-1-7/mono/scripts/mono-service.in 2005-10-28 16:34:39 UTC
(rev 52333)
+++ branches/mono-1-1-7/mono/scripts/mono-service.in 2005-10-28 16:36:28 UTC
(rev 52334)
@@ -1,4 +1,7 @@
#!/bin/sh
+a=`which "$0"`
+d=`which "$a"`
+
args="$@"
assembly=
while test x$1 != x; do
@@ -29,4 +32,5 @@
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 &
+
Modified: branches/mono-1-1-7/mono/scripts/script.in
===================================================================
--- branches/mono-1-1-7/mono/scripts/script.in 2005-10-28 16:34:39 UTC (rev
52333)
+++ branches/mono-1-1-7/mono/scripts/script.in 2005-10-28 16:36:28 UTC (rev
52334)
@@ -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@ "$@"
Modified: branches/mono-1-1-7/mono/scripts/script2.in
===================================================================
--- branches/mono-1-1-7/mono/scripts/script2.in 2005-10-28 16:34:39 UTC (rev
52333)
+++ branches/mono-1-1-7/mono/scripts/script2.in 2005-10-28 16:36:28 UTC (rev
52334)
@@ -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@ "$@"
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
