Fri, 22 Sep 2023 23:22:28 +0200
fix wrong EPREFIX when PREFIX is overridden
--- 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"}
--- 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"}
--- 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"}
--- 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"}