One more fix for docdir in makefile.

This commit is contained in:
Michael R Sweet 2024-03-21 11:20:50 -04:00
parent 883f174de2
commit be928961e0
No known key found for this signature in database
GPG Key ID: BE67C75EC81F3244
2 changed files with 18 additions and 5 deletions

13
configure vendored
View File

@ -1389,7 +1389,7 @@ Optional Packages:
--with-dsoflags=... Specify additional DSOFLAGS --with-dsoflags=... Specify additional DSOFLAGS
--with-ldflags=... Specify additional LDFLAGS --with-ldflags=... Specify additional LDFLAGS
--with-docdir set directory for documentation, --with-docdir set directory for documentation,
default=${prefix}/share/doc/mxml default=${prefix}/share/doc/mxml4
Some influential environment variables: Some influential environment variables:
CC C compiler command CC C compiler command
@ -4661,7 +4661,16 @@ then :
else $as_nop else $as_nop
docdir="NONE" if test x$enable_libmxml4_prefix != xno
then :
docdir="\${prefix}/share/doc/mxml4"
else $as_nop
docdir="\${prefix}/share/doc/mxml"
fi
fi fi

View File

@ -324,12 +324,16 @@ AC_ARG_WITH([ldflags], AS_HELP_STRING([--with-ldflags=...], [Specify additional
dnl Directories... dnl Directories...
AC_ARG_WITH([docdir], AS_HELP_STRING([--with-docdir], [set directory for documentation, default=${prefix}/share/doc/mxml]), [ AC_ARG_WITH([docdir], AS_HELP_STRING([--with-docdir], [set directory for documentation, default=${prefix}/share/doc/mxml4]), [
docdir="$withval" docdir="$withval"
], [ ], [
docdir="NONE" AS_IF([test x$enable_libmxml4_prefix != xno], [
docdir="\${prefix}/share/doc/mxml4"
], [
docdir="\${prefix}/share/doc/mxml"
])
]) ])
AC_SUBST(docdir) AC_SUBST([docdir])
AS_IF([test "$prefix" = NONE], [ AS_IF([test "$prefix" = NONE], [
# Default prefix isn't bound until AC_OUTPUT... # Default prefix isn't bound until AC_OUTPUT...