if $prefix = "NONE" then set $prefix to $ac_default_prefix. I didn't realise

at the time $prefix isn't populated unless --prefix is provided.  This broke
paths for any situation where --prefix wasn't provided.  On Linux wx can figure
out the install prefix automatically at the moment we use SetInstallPrefix in w
to set the prefix which was being set to 'NONE' if --prefix wasn't used.
(broken locale on linux reported by tomman)

Originally committed to SVN as r2619.
This commit is contained in:
Amar Takhar 2009-01-04 04:38:32 +00:00
parent bb61298853
commit c5ccada420
1 changed files with 4 additions and 0 deletions

View File

@ -86,6 +86,10 @@ AC_C_BIGENDIAN(
aegisubdatadir="$datadir/aegisub" aegisubdatadir="$datadir/aegisub"
AC_SUBST(aegisubdatadir) AC_SUBST(aegisubdatadir)
if test "$prefix" = "NONE"; then
prefix="$ac_default_prefix"
fi
# Install prefix used by wxStandardPaths::SetInstallPrefix. # Install prefix used by wxStandardPaths::SetInstallPrefix.
AC_DEFINE_UNQUOTED([INSTALL_PREFIX], ["$prefix"], [Default install prefix, or --prefix.]) AC_DEFINE_UNQUOTED([INSTALL_PREFIX], ["$prefix"], [Default install prefix, or --prefix.])