* .pc and wrapper scripts: Use relative paths so gtk-sharp is

relocatable svn path=/trunk/gtk-sharp/; revision=52437
2024-07-29 06:02:08 +02:00 · 2005-11-01 05:12:12 +00:00 · 2005-11-01 05:12:12 +00:00 · a36a3d4c0e
commit a36a3d4c0e
parent 05526600ae
18 changed files with 44 additions and 17 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+2005-10-31  Wade Berrier <wberrier@novell.com>
+
+	* .pc and wrapper scripts: Use relative paths so gtk-sharp is 
+	relocatable
+
 2005-10-19  Mike Kestner  <mkestner@novell.com>

 	* gtk/TextBuffer.custom : add some obsolete overloads for backward
--- a/art/art-sharp-2.0.pc.in
+++ b/art/art-sharp-2.0.pc.in
@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 gapidir=${prefix}/share/gapi-2.0
--- a/configure.in.in
+++ b/configure.in.in
@ -104,6 +104,12 @@ if test "x$has_mono" = "xtrue"; then
 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=
--- a/gconf/GConf/gconf-sharp-2.0.pc.in
+++ b/gconf/GConf/gconf-sharp-2.0.pc.in
@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib

--- a/gconf/tools/gconfsharp2-schemagen.in
+++ b/gconf/tools/gconfsharp2-schemagen.in
@ -1,2 +1,6 @@
 #!/bin/sh
-@RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@"
+
+a=`which "$0"`
+d=`dirname "$a"`
+
+@RUNTIME@ $d/../lib/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@"
--- a/generator/gapi2-codegen.in
+++ b/generator/gapi2-codegen.in
@ -1,2 +1,6 @@
 #!/bin/sh
-@RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gapi_codegen.exe "$@"
+
+a=`which "$0"`
+d=`dirname "$a"`
+
+@RUNTIME@ $d/../lib/gtk-sharp-2.0/gapi_codegen.exe "$@"
--- a/glade/glade-sharp-2.0.pc.in
+++ b/glade/glade-sharp-2.0.pc.in
@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 gapidir=${prefix}/share/gapi-2.0
--- a/glib/glib-sharp-2.0.pc.in
+++ b/glib/glib-sharp-2.0.pc.in
@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib

--- a/gnome/gnome-sharp-2.0.pc.in
+++ b/gnome/gnome-sharp-2.0.pc.in
@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 gapidir=${prefix}/share/gapi-2.0
--- a/gnomevfs/gnome-vfs-sharp-2.0.pc.in
+++ b/gnomevfs/gnome-vfs-sharp-2.0.pc.in
@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 gapidir=${prefix}/share/gapi-2.0
--- a/gtk/gtk-sharp-2.0.pc.in
+++ b/gtk/gtk-sharp-2.0.pc.in
@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 gapidir=${prefix}/share/gapi-2.0
--- a/gtkdotnet/gtk-dotnet-2.0.pc.in
+++ b/gtkdotnet/gtk-dotnet-2.0.pc.in
@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib

--- a/gtkhtml/gtkhtml-sharp-2.0.pc.in
+++ b/gtkhtml/gtkhtml-sharp-2.0.pc.in
@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 gapidir=${prefix}/share/gapi-2.0
--- a/parser/gapi-2.0.pc.in
+++ b/parser/gapi-2.0.pc.in
@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=${pcfiledir}/../..


 Name: GAPI
--- a/parser/gapi2-fixup.in
+++ b/parser/gapi2-fixup.in
@ -1,2 +1,6 @@
 #!/bin/sh
-@RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gapi-fixup.exe "$@"
+
+a=`which "$0"`
+d=`dirname "$a"`
+
+@RUNTIME@ $d/../lib/gtk-sharp-2.0/gapi-fixup.exe "$@"
--- a/parser/gapi2-parser.in
+++ b/parser/gapi2-parser.in
@ -1,3 +1,7 @@
 #!/bin/sh
-export PATH=@prefix@/lib/gtk-sharp-2.0:$PATH
-@RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gapi-parser.exe "$@"
+
+a=`which "$0"`
+d=`dirname "$a"`
+
+export PATH=$d/../lib/gtk-sharp-2.0:$PATH
+@RUNTIME@ $d/../lib/gtk-sharp-2.0/gapi-parser.exe "$@"
--- a/rsvg/rsvg-sharp-2.0.pc.in
+++ b/rsvg/rsvg-sharp-2.0.pc.in
@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 gapidir=${prefix}/share/gapi-2.0
--- a/vte/vte-sharp-2.0.pc.in
+++ b/vte/vte-sharp-2.0.pc.in
@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 gapidir=${prefix}/share/gapi-2.0