Fix 1568925: fix problem with definition of the IMAGE_DIR at configure time

git-svn-id: http://svn.voria.com/code@486 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-studio/trunk/config/configure.ac b/synfig-studio/trunk/config/configure.ac
index f526c38..1cfbee7 100755 (executable)
--- a/synfig-studio/trunk/config/configure.ac
+++ b/synfig-studio/trunk/config/configure.ac
@@ -168,20 +168,15 @@ AC_SUBST(VERSION_REV)
 # fmod stuff...
 AC_SUBST(FMOD_LIBS)
 
-imagedir=$datadir/pixmaps
-
+eval datadir="${datadir}"
+eval datadir="${datadir}"
+eval datadir="${datadir}"
+eval imagedir="${datadir}/pixmaps"
 imageext=png
-
 AC_SUBST(imageext)
 AC_SUBST(imagedir)
-
-
-
 AC_DEFINE_UNQUOTED(IMAGE_EXT,"$imageext", [ Describes the file extension for images ] )
-
-[[ $prefix = NONE ]] && prefix=$ac_default_prefix
-export prefix
-AC_DEFINE_UNQUOTED(IMAGE_DIR,"`echo echo $imagedir | sh`", [ Describes where the icons and stuff will be ] )
+AC_DEFINE_UNQUOTED(IMAGE_DIR,"${imagedir}", [ Describes where the icons and stuff will be ] )
 
 AC_OUTPUT(
 Makefile
@@ -205,8 +200,8 @@ $PACKAGE_NAME v.$VERSION
 Configuration Summary
 - - - - - -
 
-Install Prefix -------------------> $prefix
-Data Prefix ----------------------> $datadir
+Install Prefix -------------------> ${prefix}
+Data Prefix ----------------------> ${datadir}
 Host Platform --------------------> $host
 Icon Format ----------------------> $imageext
 Debug Mode -----------------------> $debug