From 174b2167885d3ed548973e98b11ed2197dd536fb Mon Sep 17 00:00:00 2001 From: Joe Shaw Date: Thu, 18 Aug 2005 18:13:47 +0000 Subject: [PATCH] 2004-08-18 Joe Shaw * gsf/makefile.am: Install gsf-api.xml into gapi-2.0 dir in $datadir, not whatever prefix gtk-sharp is in. svn path=/trunk/gsf-sharp/; revision=48511 --- ChangeLog | 5 +++++ configure.in | 2 -- gsf/makefile.am | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0d5d7c..5dfa64c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-08-18 Joe Shaw + + * gsf/makefile.am: Install gsf-api.xml into gapi-2.0 dir in + $datadir, not whatever prefix gtk-sharp is in. + 2005-08-18 Joe Shaw * configure.in: Version 0.4. Don't check for mint, install the diff --git a/configure.in b/configure.in index 3c1128f..41d172f 100644 --- a/configure.in +++ b/configure.in @@ -46,10 +46,8 @@ AC_SUBST(LIB_PREFIX) AC_SUBST(LIB_SUFFIX) PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= 1.9.5) -gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-2.0` AC_SUBST(GTK_SHARP_CFLAGS) AC_SUBST(GTK_SHARP_LIBS) -AC_SUBST(gtksharp_prefix) PKG_CHECK_MODULES(GSF, libgsf-1 >= 1.12.1 libgsf-gnome-1 >= 1.12.1) AC_SUBST(GSF_CFLAGS) diff --git a/gsf/makefile.am b/gsf/makefile.am index b5efb3b..8eb8ad2 100644 --- a/gsf/makefile.am +++ b/gsf/makefile.am @@ -12,7 +12,7 @@ DISTCLEANFILES = AssemblyInfo.cs noinst_DATA = gsf-sharp.dll -apidir = @gtksharp_prefix@/share/gapi +apidir = $(datadir)/gapi-2.0 api_DATA = gsf-api.xml all: $(LIBRARY)