Skip to content

Commit

Permalink
One more fix for docdir in makefile.
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelrsweet committed Mar 21, 2024
1 parent 883f174 commit be92896
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
13 changes: 11 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -1389,7 +1389,7 @@ Optional Packages:
--with-dsoflags=... Specify additional DSOFLAGS
--with-ldflags=... Specify additional LDFLAGS
--with-docdir set directory for documentation,
default=${prefix}/share/doc/mxml
default=${prefix}/share/doc/mxml4
Some influential environment variables:
CC C compiler command
Expand Down Expand Up @@ -4661,7 +4661,16 @@ then :

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

Expand Down
10 changes: 7 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -324,12 +324,16 @@ AC_ARG_WITH([ldflags], AS_HELP_STRING([--with-ldflags=...], [Specify additional


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="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], [
# Default prefix isn't bound until AC_OUTPUT...
Expand Down

0 comments on commit be92896

Please sign in to comment.