0.8.10claws83
authorChristoph Hohmann <reboot@gmx.ch>
Wed, 5 Mar 2003 13:51:04 +0000 (13:51 +0000)
committerChristoph Hohmann <reboot@gmx.ch>
Wed, 5 Mar 2003 13:51:04 +0000 (13:51 +0000)
* configure.ac
        fix building with gnome when no prefix is set

ChangeLog.claws
configure.ac

index c651aaf563a856c0418a7b6e5b54175bd8ec86b5..b45eb78ed4a40b7003f39fbbace264e64e3bd4f0 100644 (file)
@@ -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
 2003-03-05 [paul]      0.8.10claws82
 
        * sync with 0.8.10cvs23
index 8344150ba09e6871f66a43fcb73bd54e6d75a942..54b31fef776f8d9f9736e22fb30aaafff74b1604 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 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`"
 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")
        AC_SUBST(gnomedatadir)
 fi
 AM_CONDITIONAL(SYLPHEED_GNOME, test -n "$gnomedatadir")