X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fconfig%2Fconfigure.ac;h=1cfbee735a97b6523aa66fcd79c98829fdf33d58;hb=69e4052a31c5ba95a0fd2d8ba3b96ed7be7c2cbc;hp=636f19b9df44d472fa813742b0af17aec3d24be0;hpb=4827ae1c4f7f5383655496e7556f67908e1db697;p=synfig.git diff --git a/synfig-studio/trunk/config/configure.ac b/synfig-studio/trunk/config/configure.ac index 636f19b..1cfbee7 100755 --- a/synfig-studio/trunk/config/configure.ac +++ b/synfig-studio/trunk/config/configure.ac @@ -107,7 +107,7 @@ case "$host" in with_userdir="Library/Synfig" ;; *) - with_userdir="Synfig" + with_userdir=".synfig" ;; esac ]) @@ -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