--- a/test/make/configure.vm Sat Aug 03 11:20:29 2019 +0200 +++ b/test/make/configure.vm Sat Aug 03 13:46:43 2019 +0200 @@ -1,19 +1,53 @@ #!/bin/sh -PREFIX=/usr -EPREFIX=$PREFIX +#foreach( $var in $vars ) +#if( $var.exec ) +${var.name}=`${var.value}` +#else +${var.name}=${var.value} +#end +#end +#if ( ! $project.hasVar("PREFIX") ) +PREFIX=/usr +#end +#if ( ! $project.hasVar("EPREFIX") ) +EPREFIX=$PREFIX +#end + +#if ( ! $project.hasVar("BINDIR") ) BINDIR= +#end +#if ( ! $project.hasVar("SBINDIR") ) SBINDIR= +#end +#if ( ! $project.hasVar("LIBDIR") ) LIBDIR= +#end +#if ( ! $project.hasVar("LIBEXECDIR") ) LIBEXECDIR= +#end +#if ( ! $project.hasVar("DATADIR") ) DATADIR= +#end +#if ( ! $project.hasVar("SYSCONFDIR") ) SYSCONFDIR= +#end +#if ( ! $project.hasVar("SHAREDSTATEDIR") ) SHAREDSTATEDIR= +#end +#if ( ! $project.hasVar("LOCALSTATEDIR") ) LOCALSTATEDIR= +#end +#if ( ! $project.hasVar("INCLUDEDIR") ) INCLUDEDIR= +#end +#if ( ! $project.hasVar("INFODIR") ) INFODIR= +#end +#if ( ! $project.hasVar("MANDIR") ) MANDIR= +#end OS=`uname -s` OS_VERSION=`uname -r` @@ -135,10 +169,10 @@ SBINDIR=$EPREFIX/sbin fi if [ -z $LIBDIR ]; then - LIBDIRDIR=$EPREFIX/lib + LIBDIR=$EPREFIX/lib fi if [ -z $LIBEXEC ]; then - LIBExECDIR=$EPREFIX/libexec + LIBEXECDIR=$EPREFIX/libexec fi if [ -z $DATADIR ]; then DATADIR=$PREFIX/share @@ -216,6 +250,53 @@ # # config.mk generated by configure # + +# general vars +#foreach( $var in $vars ) +${var.name}=$${var.name} +#end + +#if ( ! $project.hasVar("PREFIX") ) +PREFIX=$PREFIX +#end +#if ( ! $project.hasVar("EPREFIX") ) +EPREFIX=$EPREFIX +#end + +#if ( ! $project.hasVar("BINDIR") ) +BINDIR=$BINDIR +#end +#if ( ! $project.hasVar("SBINDIR") ) +SBINDIR=$SBINDIR +#end +#if ( ! $project.hasVar("LIBDIR") ) +LIBDIR=$LIBDIR +#end +#if ( ! $project.hasVar("LIBEXECDIR") ) +LIBEXECDIR=$LIBEXECDIR +#end +#if ( ! $project.hasVar("DATADIR") ) +DATADIR=$DATADIR +#end +#if ( ! $project.hasVar("SYSCONFDIR") ) +SYSCONFDIR=$SYSCONFDIR +#end +#if ( ! $project.hasVar("SHAREDSTATEDIR") ) +SHAREDSTATEDIR=$SHAREDSTATEDIR +#end +#if ( ! $project.hasVar("LOCALSTATEDIR") ) +LOCALSTATEDIR=$LOCALSTATEDIR +#end +#if ( ! $project.hasVar("INCLUDEDIR") ) +INCLUDEDIR=$INCLUDEDIR +#end +#if ( ! $project.hasVar("INFODIR") ) +INFODIR=$INFODIR +#end +#if ( ! $project.hasVar("MANDIR") ) +MANDIR=$MANDIR +#end + __EOF__ echo > $TEMP_DIR/make.mk