Fix 1568925 the real way recommended by the autoconf manual

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

diff --git a/synfig-studio/trunk/config/configure.ac b/synfig-studio/trunk/config/configure.ac
index 1cfbee7..d4937ae 100755 (executable)
--- a/synfig-studio/trunk/config/configure.ac
+++ b/synfig-studio/trunk/config/configure.ac
@@ -168,15 +168,8 @@ AC_SUBST(VERSION_REV)
 # fmod stuff...
 AC_SUBST(FMOD_LIBS)
 
-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 ] )
-AC_DEFINE_UNQUOTED(IMAGE_DIR,"${imagedir}", [ Describes where the icons and stuff will be ] )
 
 AC_OUTPUT(
 Makefile
@@ -200,8 +193,7 @@ $PACKAGE_NAME v.$VERSION
 Configuration Summary
 - - - - - -
 
-Install Prefix -------------------> ${prefix}
-Data Prefix ----------------------> ${datadir}
+Install Prefix -------------------> $prefix
 Host Platform --------------------> $host
 Icon Format ----------------------> $imageext
 Debug Mode -----------------------> $debug

diff --git a/synfig-studio/trunk/src/gtkmm/Makefile.am b/synfig-studio/trunk/src/gtkmm/Makefile.am
index c696b77..90932c8 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/Makefile.am
+++ b/synfig-studio/trunk/src/gtkmm/Makefile.am
@@ -51,4 +51,4 @@ bin_PROGRAMS  =       synfigstudio
 synfigstudio_SOURCES = $(MOD_MIRROR_CC) $(MOD_MIRROR_HH) $(PALETTE_CC) $(PALETTE_HH) $(WORKAREARENDERER_CC) $(WORKAREARENDERER_HH) $(ACTION_MANAGERS_HH) $(ACTION_MANAGERS_CC) $(DOCK_HH) $(DOCK_CC) $(OTHER_HH) $(OTHER_CC) $(EVENTS_HH) $(EVENTS_CC) $(DUCKTRANSFORM_HH) $(DUCKTRANSFORM_CC) $(TREEVIEW_HH) $(TREEVIEW_CC) $(TREESTORE_HH) $(TREESTORE_CC) $(STATE_CC) $(STATE_HH) $(WIDGET_CC) $(WIDGET_HH) $(DIALOG_HH) $(DIALOG_CC) $(CELLRENDERER_HH) $(CELLRENDERER_CC) 
 synfigstudio_LDADD = -L../synfigapp -lsynfigapp @SYNFIG_LIBS@ @GTKMM_LIBS@ @FMOD_LIBS@
 synfigstudio_LDFLAGS=-dlopen self
-synfigstudio_CXXFLAGS=@SYNFIG_CFLAGS@ @GTKMM_CFLAGS@
+synfigstudio_CXXFLAGS=@SYNFIG_CFLAGS@ @GTKMM_CFLAGS@ -DIMAGE_DIR=\"$(datadir)/share/pixmaps\" -DIMAGE_EXT=\"$(imageext)\"