From: <ai...@pr...> - 2004-01-28 17:57:45
|
Update of /cvsroot/plplot/plplot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16235 Modified Files: configure.ac Log Message: Use EXPAND_EXPRESSION to determine PYTHON_INSTDIR and JAVA_INSTDIR rather than previous multiple invocations of echo and sed to do the same thing. Index: configure.ac =================================================================== RCS file: /cvsroot/plplot/plplot/configure.ac,v retrieving revision 1.156 retrieving revision 1.157 diff -u -d -r1.156 -r1.157 --- configure.ac 25 Jan 2004 23:03:50 -0000 1.156 +++ configure.ac 28 Jan 2004 17:56:29 -0000 1.157 @@ -505,8 +505,7 @@ ### symbolic prefix is replaced by the actual prefix. ### The actual prefix is required in examples/python/plplot_python_start.py ### (the only place that PYTHON_INSTDIR is used). - PYTHON_INSTDIR=`echo $pythondir |sed 's%${prefix}/%%'` - PYTHON_INSTDIR="$prefix/$PYTHON_INSTDIR" + EXPAND_EXPRESSION(PYTHON_INSTDIR, $pythondir) fi fi AC_SUBST(PYTHON_INSTDIR) @@ -610,12 +609,7 @@ JAVAINCCMD="-I$JAVAINCDIR -I$JAVAMDINCDIR" ### bindings/java/config.java.in requires JAVA_INSTDIR ### The symbolic exec_prefix must be replaced by the actual exec_prefix. - JAVA_INSTDIR=`echo $libdir |sed 's%${exec_prefix}/%%'` - JAVA_INSTDIR="$exec_prefix/$JAVA_INSTDIR/java/plplot/core" -### The actual exec_prefix may be the symbolic prefix which must be replaced -### by its actual value. - JAVA_INSTDIR=`echo $JAVA_INSTDIR |sed 's%${prefix}/%%'` - JAVA_INSTDIR="$prefix/$JAVA_INSTDIR" + EXPAND_EXPRESSION(JAVA_INSTDIR, $libdir/java/plplot/core) fi AC_SUBST(JAVAINCCMD) AC_SUBST(JAVA_INSTDIR) |