SF.net SVN: geany: [858] trunk

[eht16 at users.sourceforge.net]

Revision: 858
          http://svn.sourceforge.net/geany/?rev=858&view=rev
Author:   eht16
Date:     2006-10-01 10:28:45 -0700 (Sun, 01 Oct 2006)

Log Message:
-----------
Use datarootdir for defining paths to fix autoconf 2.60 problems.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.in

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-10-01 16:14:45 UTC (rev 857)
+++ trunk/ChangeLog	2006-10-01 17:28:45 UTC (rev 858)
@@ -1,3 +1,9 @@
+2006-10-01  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * configure.in: Use datarootdir for defining paths to fix autoconf
+                 2.60 problems(thanks to Christoph Berg for reporting).
+
+
 2006-10-01  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/callbacks.c, src/filetypes.c, src/filetypes.h, TODO:

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-10-01 16:14:45 UTC (rev 857)
+++ trunk/configure.in	2006-10-01 17:28:45 UTC (rev 858)
@@ -2,7 +2,7 @@
 dnl $Id$
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(geany, 0.9)
+AM_INIT_AUTOMAKE(geany, 0.10)
 
 
 AM_CONFIG_HEADER(config.h)
@@ -129,19 +129,23 @@
 
 
 # Set ${datadir}
-if test "x${datadir}" = 'x${prefix}/share'; then
+if test "x${datadir}" = 'x${prefix}/share' -o "x${datarootdir}" = 'x${prefix}/share'; then
 	if test "x${prefix}" = "xNONE"; then
 		prefix=${ac_default_prefix}
 	fi
 fi
+# check for datarootdir (autoconf >= 2.60), if not set(autoconf < 2.60), define it
+if test "x${datarootdir}" = "x"; then
+	datarootdir=${datadir}
+fi
 
 if test "x$want_vte" = "xyes"; then
 	AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support])
 fi
 
-GEANY_PIXMAPS_DIR=`eval echo ${datadir}/pixmaps`
+GEANY_PIXMAPS_DIR=`eval echo ${datarootdir}/pixmaps`
 AC_SUBST(GEANY_PIXMAPS_DIR)
-GEANY_DATA_DIR=`eval echo ${datadir}/geany`
+GEANY_DATA_DIR=`eval echo ${datarootdir}/geany`
 AC_SUBST(GEANY_DATA_DIR)
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.