From 2bf28247a1fda3548be8d814c83ba9c3536a4760 Mon Sep 17 00:00:00 2001 From: Christoph Hohmann Date: Wed, 5 Mar 2003 13:51:04 +0000 Subject: [PATCH] 0.8.10claws83 * configure.ac fix building with gnome when no prefix is set --- ChangeLog.claws | 5 +++++ configure.ac | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog.claws b/ChangeLog.claws index c651aaf56..b45eb78ed 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,8 @@ +2003-03-05 [christoph] 0.8.10claws83 + + * configure.ac + fix building with gnome when no prefix is set + 2003-03-05 [paul] 0.8.10claws82 * sync with 0.8.10cvs23 diff --git a/configure.ac b/configure.ac index 8344150ba..54b31fef7 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=8 MICRO_VERSION=10 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws82 +EXTRA_VERSION=claws83 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target @@ -29,7 +29,11 @@ AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) if test "$GNOME_CONFIG" != no; then gnomedatadir="`gnome-config --datadir`" gnomeprefix="`gnome-config --prefix`" - gnomedatadir="${prefix}/${gnomedatadir#${gnomeprefix}}" + if test "${prefix}" = "NONE"; then + gnomedatadir="${ac_default_prefix}/${gnomedatadir#${gnomeprefix}}" + else + gnomedatadir="${prefix}/${gnomedatadir#${gnomeprefix}}" + fi AC_SUBST(gnomedatadir) fi AM_CONDITIONAL(SYLPHEED_GNOME, test -n "$gnomedatadir") -- 2.25.1