unbreak make install step for non-Unix-style, too

This commit is contained in:
Matthew Flatt 2021-02-21 08:22:03 -07:00
parent 9dbcf179b6
commit 4df60bb819
5 changed files with 30 additions and 35 deletions

View File

@ -76,9 +76,9 @@ if test "${unixstyle}" = "no" ; then
GR_APP_CONFIG_PATH="../../../../etc"
INSTALL_ORIG_TREE=yes
if test "${enable_sharezo}" = "yes" ; then
enable_sharezo=no
echo WARNING: --enable-sharezo is ignored for an origtree installation
fi
INSTALL_LIBZO=no
else
if test "${prefix}" = "NONE" ; then
# Set prefix explicitly so we can use it during configure
@ -100,17 +100,16 @@ else
GR_APP_COLLECTS_PATH="${COLLECTS_PATH}"
GR_APP_CONFIG_PATH="${CONFIG_PATH}"
INSTALL_ORIG_TREE=no
if test "${enable_sharezo}" = "yes" ; then
INSTALL_LIBZO=no
else
INSTALL_LIBZO=libzo
fi
fi
GUI_COLLECTS_PATH="${COLLECTS_PATH}"
GUI_CONFIG_PATH="${CONFIG_PATH}"
if test "${enable_sharezo}" = "yes" ; then
INSTALL_LIBZO=no
else
INSTALL_LIBZO=libzo
fi
########################################
AC_SUBST(collectsdir)

View File

@ -3122,9 +3122,9 @@ if test "${unixstyle}" = "no" ; then
GR_APP_CONFIG_PATH="../../../../etc"
INSTALL_ORIG_TREE=yes
if test "${enable_sharezo}" = "yes" ; then
enable_sharezo=no
echo WARNING: --enable-sharezo is ignored for an origtree installation
fi
INSTALL_LIBZO=no
else
if test "${prefix}" = "NONE" ; then
# Set prefix explicitly so we can use it during configure
@ -3146,17 +3146,16 @@ else
GR_APP_COLLECTS_PATH="${COLLECTS_PATH}"
GR_APP_CONFIG_PATH="${CONFIG_PATH}"
INSTALL_ORIG_TREE=no
if test "${enable_sharezo}" = "yes" ; then
INSTALL_LIBZO=no
else
INSTALL_LIBZO=libzo
fi
fi
GUI_COLLECTS_PATH="${COLLECTS_PATH}"
GUI_CONFIG_PATH="${CONFIG_PATH}"
if test "${enable_sharezo}" = "yes" ; then
INSTALL_LIBZO=no
else
INSTALL_LIBZO=libzo
fi
########################################

View File

@ -2172,9 +2172,9 @@ if test "${unixstyle}" = "no" ; then
GR_APP_CONFIG_PATH="../../../../etc"
INSTALL_ORIG_TREE=yes
if test "${enable_sharezo}" = "yes" ; then
enable_sharezo=no
echo WARNING: --enable-sharezo is ignored for an origtree installation
fi
INSTALL_LIBZO=no
else
if test "${prefix}" = "NONE" ; then
# Set prefix explicitly so we can use it during configure
@ -2196,17 +2196,16 @@ else
GR_APP_COLLECTS_PATH="${COLLECTS_PATH}"
GR_APP_CONFIG_PATH="${CONFIG_PATH}"
INSTALL_ORIG_TREE=no
if test "${enable_sharezo}" = "yes" ; then
INSTALL_LIBZO=no
else
INSTALL_LIBZO=libzo
fi
fi
GUI_COLLECTS_PATH="${COLLECTS_PATH}"
GUI_CONFIG_PATH="${CONFIG_PATH}"
if test "${enable_sharezo}" = "yes" ; then
INSTALL_LIBZO=no
else
INSTALL_LIBZO=libzo
fi
########################################

View File

@ -2135,9 +2135,9 @@ if test "${unixstyle}" = "no" ; then
GR_APP_CONFIG_PATH="../../../../etc"
INSTALL_ORIG_TREE=yes
if test "${enable_sharezo}" = "yes" ; then
enable_sharezo=no
echo WARNING: --enable-sharezo is ignored for an origtree installation
fi
INSTALL_LIBZO=no
else
if test "${prefix}" = "NONE" ; then
# Set prefix explicitly so we can use it during configure
@ -2159,17 +2159,16 @@ else
GR_APP_COLLECTS_PATH="${COLLECTS_PATH}"
GR_APP_CONFIG_PATH="${CONFIG_PATH}"
INSTALL_ORIG_TREE=no
if test "${enable_sharezo}" = "yes" ; then
INSTALL_LIBZO=no
else
INSTALL_LIBZO=libzo
fi
fi
GUI_COLLECTS_PATH="${COLLECTS_PATH}"
GUI_CONFIG_PATH="${CONFIG_PATH}"
if test "${enable_sharezo}" = "yes" ; then
INSTALL_LIBZO=no
else
INSTALL_LIBZO=libzo
fi
########################################

View File

@ -3087,9 +3087,9 @@ if test "${unixstyle}" = "no" ; then
GR_APP_CONFIG_PATH="../../../../etc"
INSTALL_ORIG_TREE=yes
if test "${enable_sharezo}" = "yes" ; then
enable_sharezo=no
echo WARNING: --enable-sharezo is ignored for an origtree installation
fi
INSTALL_LIBZO=no
else
if test "${prefix}" = "NONE" ; then
# Set prefix explicitly so we can use it during configure
@ -3111,17 +3111,16 @@ else
GR_APP_COLLECTS_PATH="${COLLECTS_PATH}"
GR_APP_CONFIG_PATH="${CONFIG_PATH}"
INSTALL_ORIG_TREE=no
if test "${enable_sharezo}" = "yes" ; then
INSTALL_LIBZO=no
else
INSTALL_LIBZO=libzo
fi
fi
GUI_COLLECTS_PATH="${COLLECTS_PATH}"
GUI_CONFIG_PATH="${CONFIG_PATH}"
if test "${enable_sharezo}" = "yes" ; then
INSTALL_LIBZO=no
else
INSTALL_LIBZO=libzo
fi
########################################