From 2e5980815ecc57a6d0f472cb0eacb26239e258ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Marchal?= Date: Wed, 10 Feb 2010 19:00:46 +0000 Subject: [PATCH] Ported r248 from branches/v2_2_7 (expand prefix in path written to stdout) --- configure.in | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index 6b23e50..34bd3d7 100644 --- a/configure.in +++ b/configure.in @@ -139,8 +139,7 @@ AC_ARG_ENABLE(sargphp, fi ],[SARGPHPDIR="/var/www/html"]) if test "$SARGPHPDIR" ; then - tempfullpath=`eval "echo $SARGPHPDIR"` - echo "using $tempfullpath as the directory to install sarg-php" + echo "using $SARGPHPDIR as the directory to install sarg-php" AC_SUBST(SARGPHPDIR) fi @@ -153,7 +152,11 @@ AC_ARG_ENABLE(languagedir, LANGDIR=$enableval fi ],[LANGDIR="${datarootdir}/sarg/languages"]) -tempfullpath=`eval "echo $LANGDIR"` +if test "x$prefix" == "xNONE" ; then + tempfullpath=`prefix=$ac_default_prefix ; eval "echo $LANGDIR"` +else + tempfullpath=`eval "echo $LANGDIR"` +fi echo "using $tempfullpath as the directory of the translations" AC_SUBST(LANGDIR) @@ -167,7 +170,11 @@ AC_ARG_ENABLE(fontdir, fi ],[FONTDIR="${datarootdir}/sarg/fonts"]) if test "$FONTDIR" ; then - tempfullpath=`eval "echo $FONTDIR"` + if test "x$prefix" == "xNONE" ; then + tempfullpath=`prefix=$ac_default_prefix ; eval "echo $FONTDIR"` + else + tempfullpath=`eval "echo $FONTDIR"` + fi echo "using $tempfullpath as the directory of the fonts" AC_SUBST(FONTDIR) fi @@ -181,7 +188,11 @@ AC_ARG_ENABLE(imagedir, IMAGEDIR=$enableval fi ],[IMAGEDIR="${datarootdir}/sarg/images"]) -tempfullpath=`eval "echo $IMAGEDIR"` +if test "x$prefix" == "xNONE" ; then + tempfullpath=`prefix=$ac_default_prefix ; eval "echo $IMAGEDIR"` +else + tempfullpath=`eval "echo $IMAGEDIR"` +fi echo "using $tempfullpath as the directory of the images" AC_SUBST(IMAGEDIR) -- 2.47.2