X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fconfig%2Fconfigure.ac;h=1cfbee735a97b6523aa66fcd79c98829fdf33d58;hb=69e4052a31c5ba95a0fd2d8ba3b96ed7be7c2cbc;hp=1d2565186b7323cc6a54c19d6c272c3c6016b2d4;hpb=633c08b084b6ab9868e0c0f428903467e536afb9;p=synfig.git

diff --git a/synfig-studio/trunk/config/configure.ac b/synfig-studio/trunk/config/configure.ac
index 1d25651..1cfbee7 100755
--- a/synfig-studio/trunk/config/configure.ac
+++ b/synfig-studio/trunk/config/configure.ac
@@ -1,4 +1,4 @@
-# $Header: /opt/voria/cvs/studio/config/configure.ac,v 1.3 2005/01/17 05:20:08 darco Exp $
+# $Id$
 
 # -- I N I T --------------------------------------------------
 
@@ -15,6 +15,7 @@ dnl AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 
+API_VERSION=@API_VERSION@
 
 # -- V A R I A B L E S ----------------------------------------
 
@@ -106,7 +107,7 @@ case "$host" in
 		with_userdir="Library/Synfig"
 	;;
 	*)
-		with_userdir="Synfig"
+		with_userdir=".synfig"
 	;;
 esac
 ])
@@ -155,6 +156,8 @@ AC_SUBST(CXXFLAGS)
 AC_SUBST(LDFLAGS)
 AC_SUBST(SVN_REPOSITORY)
 
+AC_SUBST(API_VERSION)
+
 VERSION_MAJ=@VERSION_MAJ@
 VERSION_MIN=@VERSION_MIN@
 VERSION_REV=@VERSION_REV@
@@ -165,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
@@ -202,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