ekiga r6265 - trunk

[dsandras svn gnome org]

Author: dsandras
Date: Sun May 18 10:59:36 2008
New Revision: 6265
URL: http://svn.gnome.org/viewvc/ekiga?rev=6265&view=rev

Log:
Fixed the definition of DATA_DIR which is not obsolete yet.
Fixes prefs window display.


Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun May 18 10:59:36 2008
@@ -573,7 +573,11 @@
 AC_SUBST(gnomedatadir)
 AC_SUBST(gnomeconfdir)
 
-AC_DEFINE_UNQUOTED(DATA_DIR, "${ac_default_prefix}/${DATADIRNAME}",[fix])
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(DATA_DIR, "${ac_default_prefix}/${DATADIRNAME}",[fix])
+else
+  AC_DEFINE_UNQUOTED(DATA_DIR, "${prefix}/${DATADIRNAME}",[fix])
+fi
 
 dnl ###########################################################################
 dnl  Output the different Makefiles