fix wrong EPREFIX when PREFIX is overridden

Fri, 22 Sep 2023 23:22:28 +0200

author
Mike Becker <universe@uap-core.de>
date
Fri, 22 Sep 2023 23:22:28 +0200
changeset 75
b49869bd2a0a
parent 74
30b70a68ad26
child 76
620358ea3a0b

fix wrong EPREFIX when PREFIX is overridden

src/test/resources/golden-sample/configure file | annotate | diff | comparison | revisions
src/test/resources/golden-sample/configure2 file | annotate | diff | comparison | revisions
test/configure file | annotate | diff | comparison | revisions
test/make/configure.vm file | annotate | diff | comparison | revisions
--- 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"}

mercurial