Commit fd60aa4c authored by David Johnson's avatar David Johnson

Fix broken emptiness check of WINDOWS_KEY_7PRO_X86.

This happens to be important right now because if there is a product
key specified, a little sed command generates a new .in file, in the src
dir, from a template... and thus you cannot have a read-only copy of the
src tree even if building in a separate obj dir.  Have an ro src tree is
helpful for Docker image emulabization, and it's a good thing anyway.
parent 7de8603f
......@@ -4487,7 +4487,7 @@ done
# based on which variables are defined.
# Win7 Pro x86
if test -n ${WINDOWS_KEY_7PRO_X86}; then
if test -n "${WINDOWS_KEY_7PRO_X86}"; then
WIN7_IMNAME="Windows 7 PROFESSIONAL"
sed -e "s/@WIN7_IMNAME@/$WIN7_IMNAME/" < $srcdir/tmcc/cygwinseven/unattend-x86.xml.in.tmpl > $srcdir/tmcc/cygwinseven/unattend-7pro-x86.xml.in
winfiles="$winfiles tmcc/cygwinseven/unattend-7pro-x86.xml"
......
......@@ -221,7 +221,7 @@ AC_SUBST(PYTHON_INCLUDE)
# based on which variables are defined.
# Win7 Pro x86
if test -n ${WINDOWS_KEY_7PRO_X86}; then
if test -n "${WINDOWS_KEY_7PRO_X86}"; then
WIN7_IMNAME="Windows 7 PROFESSIONAL"
sed -e "s/@WIN7_IMNAME@/$WIN7_IMNAME/" < $srcdir/tmcc/cygwinseven/unattend-x86.xml.in.tmpl > $srcdir/tmcc/cygwinseven/unattend-7pro-x86.xml.in
winfiles="$winfiles tmcc/cygwinseven/unattend-7pro-x86.xml"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment