diff --git a/ChangeLog b/ChangeLog index 60fb94997..6ebe26c60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-31 Wade Berrier + + * .pc and wrapper scripts: Use relative paths so gtk-sharp is + relocatable + 2005-10-19 Mike Kestner * gtk/TextBuffer.custom : add some obsolete overloads for backward diff --git a/art/art-sharp-2.0.pc.in b/art/art-sharp-2.0.pc.in index 03aa5956f..7ed3fbf9c 100644 --- 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 diff --git a/configure.in.in b/configure.in.in index 98e49ba6c..a20b7bae3 100644 --- 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= diff --git a/gconf/GConf/gconf-sharp-2.0.pc.in b/gconf/GConf/gconf-sharp-2.0.pc.in index 8c8c66aa4..820087d0f 100644 --- 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 diff --git a/gconf/tools/gconfsharp2-schemagen.in b/gconf/tools/gconfsharp2-schemagen.in index 978c407fe..2034b5eb7 100644 --- 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 "$@" diff --git a/generator/gapi2-codegen.in b/generator/gapi2-codegen.in index b7a2621f6..6444f2ea4 100755 --- 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 "$@" diff --git a/glade/glade-sharp-2.0.pc.in b/glade/glade-sharp-2.0.pc.in index cf0e4fd0e..9c4bb5f2e 100644 --- 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 diff --git a/glib/glib-sharp-2.0.pc.in b/glib/glib-sharp-2.0.pc.in index 23e5ecb06..e4378e0f9 100644 --- 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 diff --git a/gnome/gnome-sharp-2.0.pc.in b/gnome/gnome-sharp-2.0.pc.in index a3dfc9acb..1901cbf38 100644 --- 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 diff --git a/gnomevfs/gnome-vfs-sharp-2.0.pc.in b/gnomevfs/gnome-vfs-sharp-2.0.pc.in index dc1891a68..1dc7e0b37 100644 --- 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 diff --git a/gtk/gtk-sharp-2.0.pc.in b/gtk/gtk-sharp-2.0.pc.in index d26cc767b..c044705a3 100644 --- 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 diff --git a/gtkdotnet/gtk-dotnet-2.0.pc.in b/gtkdotnet/gtk-dotnet-2.0.pc.in index f40fb20bd..b0b1c6350 100644 --- 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 diff --git a/gtkhtml/gtkhtml-sharp-2.0.pc.in b/gtkhtml/gtkhtml-sharp-2.0.pc.in index dc9e231db..a2eb10c4f 100644 --- 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 diff --git a/parser/gapi-2.0.pc.in b/parser/gapi-2.0.pc.in index 16b2079b3..665d02608 100644 --- a/parser/gapi-2.0.pc.in +++ b/parser/gapi-2.0.pc.in @@ -1,4 +1,4 @@ -prefix=@prefix@ +prefix=${pcfiledir}/../.. Name: GAPI diff --git a/parser/gapi2-fixup.in b/parser/gapi2-fixup.in index 906ddf611..497729fe0 100755 --- 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 "$@" diff --git a/parser/gapi2-parser.in b/parser/gapi2-parser.in index 25e54ca38..d78140f80 100755 --- 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 "$@" diff --git a/rsvg/rsvg-sharp-2.0.pc.in b/rsvg/rsvg-sharp-2.0.pc.in index d69d9ba89..feea8fd97 100644 --- 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 diff --git a/vte/vte-sharp-2.0.pc.in b/vte/vte-sharp-2.0.pc.in index 9e17eb767..df7ba3e25 100644 --- 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