* Makefile.am

* configure.ac
        fix gnome prefix problems, the configure script now removed
        `gnome-config --prefix` from `gnome-config --datadir`
        and adds $(prefix} instead

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 880dc60..c5ae0cf 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2003-02-24 [christoph]
+
+       * Makefile.am
+       * configure.ac
+               fix gnome prefix problems, the configure script now removed
+               `gnome-config --prefix` from `gnome-config --datadir`
+               and adds $(prefix} instead
+
 2003-02-24 [christoph] 0.8.10claws49
 
        * src/news.c

diff --git a/Makefile.am b/Makefile.am
index f0fe898..26c4a0e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,9 @@ EXTRA_DIST = \
        autogen.sh 
 
 if SYLPHEED_GNOME
-pixmapdir=$(gnomedir)/share/pixmaps
+pixmapdir=$(gnomedatadir)/pixmaps
 pixmap_DATA=sylpheed.png
-gnomapdir=$(gnomedir)/share/gnome/apps/Internet
+gnomapdir=$(gnomedatadir)/gnome/apps/Internet
 gnomap_DATA=sylpheed.desktop
 else
 pixmapdir=

diff --git a/configure.ac b/configure.ac
index e3607c9..f9bd699 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,10 +27,12 @@ AC_SUBST(VERSION)
 dnl GNOME installed?
 AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
 if test "$GNOME_CONFIG" != no; then
-       gnomedir="`gnome-config --prefix`"
-       AC_SUBST(gnomedir)
+       gnomedatadir="`gnome-config --datadir`"
+       gnomeprefix="`gnome-config --prefix`"
+       gnomedatadir="${prefix}/${gnomedatadir#${gnomeprefix}}"
+       AC_SUBST(gnomedatadir)
 fi
-AM_CONDITIONAL(SYLPHEED_GNOME, test -d "$gnomedir")
+AM_CONDITIONAL(SYLPHEED_GNOME, test -n "$gnomedatadir")
 
 dnl Claws version
 AC_DEFINE(CLAWS, 1, Compiling Claws branch of sylpheed)