# HG changeset patch # User Mike Becker # Date 1695417748 -7200 # Node ID b49869bd2a0a854a9752de50b7c19cf9e0d517f8 # Parent 30b70a68ad2662fd71e675e764a0e1eec501255c fix wrong EPREFIX when PREFIX is overridden diff -r 30b70a68ad26 -r b49869bd2a0a src/test/resources/golden-sample/configure --- a/src/test/resources/golden-sample/configure Fri Sep 22 22:30:18 2023 +0200 +++ b/src/test/resources/golden-sample/configure Fri Sep 22 23:22:28 2023 +0200 @@ -15,7 +15,7 @@ # define standard variables PREFIX=/usr -EPREFIX=/usr +EPREFIX= BINDIR= SBINDIR= LIBDIR= @@ -104,6 +104,7 @@ # set dir variables +: ${EPREFIX:="$PREFIX"} : ${BINDIR:="$EPREFIX/bin"} : ${SBINDIR:="$EPREFIX/sbin"} : ${LIBDIR:="$EPREFIX/lib"} diff -r 30b70a68ad26 -r b49869bd2a0a src/test/resources/golden-sample/configure2 --- a/src/test/resources/golden-sample/configure2 Fri Sep 22 22:30:18 2023 +0200 +++ b/src/test/resources/golden-sample/configure2 Fri Sep 22 23:22:28 2023 +0200 @@ -15,7 +15,7 @@ # define standard variables PREFIX=/usr -EPREFIX=/usr +EPREFIX= BINDIR= SBINDIR= LIBDIR= @@ -110,6 +110,7 @@ # set dir variables +: ${EPREFIX:="$PREFIX"} : ${BINDIR:="$EPREFIX/bin"} : ${SBINDIR:="$EPREFIX/sbin"} : ${LIBDIR:="$EPREFIX/lib"} diff -r 30b70a68ad26 -r b49869bd2a0a test/configure --- a/test/configure Fri Sep 22 22:30:18 2023 +0200 +++ b/test/configure Fri Sep 22 23:22:28 2023 +0200 @@ -15,7 +15,7 @@ # define standard variables PREFIX=/usr -EPREFIX=/usr +EPREFIX= BINDIR= SBINDIR= LIBDIR= @@ -104,6 +104,7 @@ # set dir variables +: ${EPREFIX:="$PREFIX"} : ${BINDIR:="$EPREFIX/bin"} : ${SBINDIR:="$EPREFIX/sbin"} : ${LIBDIR:="$EPREFIX/lib"} diff -r 30b70a68ad26 -r b49869bd2a0a test/make/configure.vm --- a/test/make/configure.vm Fri Sep 22 22:30:18 2023 +0200 +++ b/test/make/configure.vm Fri Sep 22 23:22:28 2023 +0200 @@ -15,7 +15,7 @@ # define standard variables PREFIX=/usr -EPREFIX=/usr +EPREFIX= BINDIR= SBINDIR= LIBDIR= @@ -136,6 +136,7 @@ ## Begin unparsed content. ** #[[ # set dir variables +: ${EPREFIX:="$PREFIX"} : ${BINDIR:="$EPREFIX/bin"} : ${SBINDIR:="$EPREFIX/sbin"} : ${LIBDIR:="$EPREFIX/lib"}