Change the makefile template language somewhat. Previously variables

had been denoted with @{var:NAME}, this has changed to %{NAME}. This is
pretty much a wash for configure.pl but it makes it much easier to process
the templates using Python's string.Template. The logic being the 'var:'
prefix had been to support conditional statements in the templates (using
an 'if:' prefix), but this functionality was not being used and support
for it is removed from configure.pl in this revision.

For a similiar reason, rename a number of template variables with hyphens
in their name to use underscores instead. This is slightly more consistent
anyway (since many variable names had already used _ instead of -) but more
importantly makes them much easier to deal with using aforementioned Python
template code.

This should not result in any user-visible change (unless I messed up).

1 files changed, 6 insertions, 6 deletions

diff --git a/src/build-data/botan-config.in b/src/build-data/botan-config.in
index 28b494254..f3fa3db94 100644
--- a/src/build-data/botan-config.in
+++ b/src/build-data/botan-config.in
@@ -2,15 +2,15 @@
 
 # For normal builds:
 guess_prefix=`dirname \`dirname $0\``
-includedir=@{var:includedir}
-libdir=@{var:libdir}
+includedir=%{includedir}
+libdir=%{libdir}
 
 #  For workspace builds:
 #guess_prefix=`dirname $0`
 #includedir=build/include
 #libdir=
 
-install_prefix=@{var:prefix}
+install_prefix=%{prefix}
 prefix=
 
 usage()
@@ -42,7 +42,7 @@ while test $# -gt 0; do
         echo $prefix
         ;;
     --version)
-        echo @{var:version}
+        echo %{version}
         exit 0
         ;;
     --cflags)
@@ -54,9 +54,9 @@ while test $# -gt 0; do
     --libs)
         if [ $prefix != "/usr" -a $prefix != "/usr/local" ]
         then
-           echo -L$prefix/$libdir -lbotan @{var:link_to}
+           echo -L$prefix/$libdir -lbotan %{link_to}
         else
-           echo -lbotan @{var:link_to}
+           echo -lbotan %{link_to}
         fi
         ;;
     *)