Author: wade
Date: 2005-11-01 00:12:12 -0500 (Tue, 01 Nov 2005)
New Revision: 52437
Modified:
trunk/gtk-sharp/ChangeLog
trunk/gtk-sharp/art/art-sharp-2.0.pc.in
trunk/gtk-sharp/configure.in.in
trunk/gtk-sharp/gconf/GConf/gconf-sharp-2.0.pc.in
trunk/gtk-sharp/gconf/tools/gconfsharp2-schemagen.in
trunk/gtk-sharp/generator/gapi2-codegen.in
trunk/gtk-sharp/glade/glade-sharp-2.0.pc.in
trunk/gtk-sharp/glib/glib-sharp-2.0.pc.in
trunk/gtk-sharp/gnome/gnome-sharp-2.0.pc.in
trunk/gtk-sharp/gnomevfs/gnome-vfs-sharp-2.0.pc.in
trunk/gtk-sharp/gtk/gtk-sharp-2.0.pc.in
trunk/gtk-sharp/gtkdotnet/gtk-dotnet-2.0.pc.in
trunk/gtk-sharp/gtkhtml/gtkhtml-sharp-2.0.pc.in
trunk/gtk-sharp/parser/gapi-2.0.pc.in
trunk/gtk-sharp/parser/gapi2-fixup.in
trunk/gtk-sharp/parser/gapi2-parser.in
trunk/gtk-sharp/rsvg/rsvg-sharp-2.0.pc.in
trunk/gtk-sharp/vte/vte-sharp-2.0.pc.in
Log:
* .pc and wrapper scripts: Use relative paths so gtk-sharp is
relocatable
Modified: trunk/gtk-sharp/ChangeLog
===================================================================
--- trunk/gtk-sharp/ChangeLog 2005-11-01 01:58:06 UTC (rev 52436)
+++ trunk/gtk-sharp/ChangeLog 2005-11-01 05:12:12 UTC (rev 52437)
@@ -1,3 +1,8 @@
+2005-10-31 Wade Berrier <[EMAIL PROTECTED]>
+
+ * .pc and wrapper scripts: Use relative paths so gtk-sharp is
+ relocatable
+
2005-10-19 Mike Kestner <[EMAIL PROTECTED]>
* gtk/TextBuffer.custom : add some obsolete overloads for backward
Modified: trunk/gtk-sharp/art/art-sharp-2.0.pc.in
===================================================================
--- trunk/gtk-sharp/art/art-sharp-2.0.pc.in 2005-11-01 01:58:06 UTC (rev
52436)
+++ trunk/gtk-sharp/art/art-sharp-2.0.pc.in 2005-11-01 05:12:12 UTC (rev
52437)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@
+prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
gapidir=${prefix}/share/gapi-2.0
Modified: trunk/gtk-sharp/configure.in.in
===================================================================
--- trunk/gtk-sharp/configure.in.in 2005-11-01 01:58:06 UTC (rev 52436)
+++ trunk/gtk-sharp/configure.in.in 2005-11-01 05:12:12 UTC (rev 52437)
@@ -104,6 +104,12 @@
GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /gacdir $(DESTDIR)$(prefix)/lib'
GENERATED_SOURCES=generated/*.cs
AC_PATH_PROG(RUNTIME, mono, no)
+
+# If mono is found, it's in the path. Require it to be in the path at runtime
as well
+if test "x$RUNTIME" != "no" ; then
+ RUNTIME=mono
+fi
+
AC_PATH_PROG(CSC, mcs, no)
if test `uname -s` = "Darwin"; then
LIB_PREFIX=
Modified: trunk/gtk-sharp/gconf/GConf/gconf-sharp-2.0.pc.in
===================================================================
--- trunk/gtk-sharp/gconf/GConf/gconf-sharp-2.0.pc.in 2005-11-01 01:58:06 UTC
(rev 52436)
+++ trunk/gtk-sharp/gconf/GConf/gconf-sharp-2.0.pc.in 2005-11-01 05:12:12 UTC
(rev 52437)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@
+prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
Modified: trunk/gtk-sharp/gconf/tools/gconfsharp2-schemagen.in
===================================================================
--- trunk/gtk-sharp/gconf/tools/gconfsharp2-schemagen.in 2005-11-01
01:58:06 UTC (rev 52436)
+++ trunk/gtk-sharp/gconf/tools/gconfsharp2-schemagen.in 2005-11-01
05:12:12 UTC (rev 52437)
@@ -1,2 +1,6 @@
#!/bin/sh
[EMAIL PROTECTED]@ @prefix@/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@"
+
+a=`which "$0"`
+d=`dirname "$a"`
+
[EMAIL PROTECTED]@ $d/../lib/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@"
Modified: trunk/gtk-sharp/generator/gapi2-codegen.in
===================================================================
--- trunk/gtk-sharp/generator/gapi2-codegen.in 2005-11-01 01:58:06 UTC (rev
52436)
+++ trunk/gtk-sharp/generator/gapi2-codegen.in 2005-11-01 05:12:12 UTC (rev
52437)
@@ -1,2 +1,6 @@
#!/bin/sh
[EMAIL PROTECTED]@ @prefix@/lib/gtk-sharp-2.0/gapi_codegen.exe "$@"
+
+a=`which "$0"`
+d=`dirname "$a"`
+
[EMAIL PROTECTED]@ $d/../lib/gtk-sharp-2.0/gapi_codegen.exe "$@"
Modified: trunk/gtk-sharp/glade/glade-sharp-2.0.pc.in
===================================================================
--- trunk/gtk-sharp/glade/glade-sharp-2.0.pc.in 2005-11-01 01:58:06 UTC (rev
52436)
+++ trunk/gtk-sharp/glade/glade-sharp-2.0.pc.in 2005-11-01 05:12:12 UTC (rev
52437)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@
+prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
gapidir=${prefix}/share/gapi-2.0
Modified: trunk/gtk-sharp/glib/glib-sharp-2.0.pc.in
===================================================================
--- trunk/gtk-sharp/glib/glib-sharp-2.0.pc.in 2005-11-01 01:58:06 UTC (rev
52436)
+++ trunk/gtk-sharp/glib/glib-sharp-2.0.pc.in 2005-11-01 05:12:12 UTC (rev
52437)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@
+prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
Modified: trunk/gtk-sharp/gnome/gnome-sharp-2.0.pc.in
===================================================================
--- trunk/gtk-sharp/gnome/gnome-sharp-2.0.pc.in 2005-11-01 01:58:06 UTC (rev
52436)
+++ trunk/gtk-sharp/gnome/gnome-sharp-2.0.pc.in 2005-11-01 05:12:12 UTC (rev
52437)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@
+prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
gapidir=${prefix}/share/gapi-2.0
Modified: trunk/gtk-sharp/gnomevfs/gnome-vfs-sharp-2.0.pc.in
===================================================================
--- trunk/gtk-sharp/gnomevfs/gnome-vfs-sharp-2.0.pc.in 2005-11-01 01:58:06 UTC
(rev 52436)
+++ trunk/gtk-sharp/gnomevfs/gnome-vfs-sharp-2.0.pc.in 2005-11-01 05:12:12 UTC
(rev 52437)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@
+prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
gapidir=${prefix}/share/gapi-2.0
Modified: trunk/gtk-sharp/gtk/gtk-sharp-2.0.pc.in
===================================================================
--- trunk/gtk-sharp/gtk/gtk-sharp-2.0.pc.in 2005-11-01 01:58:06 UTC (rev
52436)
+++ trunk/gtk-sharp/gtk/gtk-sharp-2.0.pc.in 2005-11-01 05:12:12 UTC (rev
52437)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@
+prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
gapidir=${prefix}/share/gapi-2.0
Modified: trunk/gtk-sharp/gtkdotnet/gtk-dotnet-2.0.pc.in
===================================================================
--- trunk/gtk-sharp/gtkdotnet/gtk-dotnet-2.0.pc.in 2005-11-01 01:58:06 UTC
(rev 52436)
+++ trunk/gtk-sharp/gtkdotnet/gtk-dotnet-2.0.pc.in 2005-11-01 05:12:12 UTC
(rev 52437)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@
+prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
Modified: trunk/gtk-sharp/gtkhtml/gtkhtml-sharp-2.0.pc.in
===================================================================
--- trunk/gtk-sharp/gtkhtml/gtkhtml-sharp-2.0.pc.in 2005-11-01 01:58:06 UTC
(rev 52436)
+++ trunk/gtk-sharp/gtkhtml/gtkhtml-sharp-2.0.pc.in 2005-11-01 05:12:12 UTC
(rev 52437)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@
+prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
gapidir=${prefix}/share/gapi-2.0
Modified: trunk/gtk-sharp/parser/gapi-2.0.pc.in
===================================================================
--- trunk/gtk-sharp/parser/gapi-2.0.pc.in 2005-11-01 01:58:06 UTC (rev
52436)
+++ trunk/gtk-sharp/parser/gapi-2.0.pc.in 2005-11-01 05:12:12 UTC (rev
52437)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@
+prefix=${pcfiledir}/../..
Name: GAPI
Modified: trunk/gtk-sharp/parser/gapi2-fixup.in
===================================================================
--- trunk/gtk-sharp/parser/gapi2-fixup.in 2005-11-01 01:58:06 UTC (rev
52436)
+++ trunk/gtk-sharp/parser/gapi2-fixup.in 2005-11-01 05:12:12 UTC (rev
52437)
@@ -1,2 +1,6 @@
#!/bin/sh
[EMAIL PROTECTED]@ @prefix@/lib/gtk-sharp-2.0/gapi-fixup.exe "$@"
+
+a=`which "$0"`
+d=`dirname "$a"`
+
[EMAIL PROTECTED]@ $d/../lib/gtk-sharp-2.0/gapi-fixup.exe "$@"
Modified: trunk/gtk-sharp/parser/gapi2-parser.in
===================================================================
--- trunk/gtk-sharp/parser/gapi2-parser.in 2005-11-01 01:58:06 UTC (rev
52436)
+++ trunk/gtk-sharp/parser/gapi2-parser.in 2005-11-01 05:12:12 UTC (rev
52437)
@@ -1,3 +1,7 @@
#!/bin/sh
-export [EMAIL PROTECTED]@/lib/gtk-sharp-2.0:$PATH
[EMAIL PROTECTED]@ @prefix@/lib/gtk-sharp-2.0/gapi-parser.exe "$@"
+
+a=`which "$0"`
+d=`dirname "$a"`
+
+export PATH=$d/../lib/gtk-sharp-2.0:$PATH
[EMAIL PROTECTED]@ $d/../lib/gtk-sharp-2.0/gapi-parser.exe "$@"
Modified: trunk/gtk-sharp/rsvg/rsvg-sharp-2.0.pc.in
===================================================================
--- trunk/gtk-sharp/rsvg/rsvg-sharp-2.0.pc.in 2005-11-01 01:58:06 UTC (rev
52436)
+++ trunk/gtk-sharp/rsvg/rsvg-sharp-2.0.pc.in 2005-11-01 05:12:12 UTC (rev
52437)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@
+prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
gapidir=${prefix}/share/gapi-2.0
Modified: trunk/gtk-sharp/vte/vte-sharp-2.0.pc.in
===================================================================
--- trunk/gtk-sharp/vte/vte-sharp-2.0.pc.in 2005-11-01 01:58:06 UTC (rev
52436)
+++ trunk/gtk-sharp/vte/vte-sharp-2.0.pc.in 2005-11-01 05:12:12 UTC (rev
52437)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@
+prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
gapidir=${prefix}/share/gapi-2.0
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
