Make the build process more portable

This commit is contained in:
Bradlee Speice 2012-07-12 10:06:08 -04:00
parent e436323d7a
commit 590af56dee
2 changed files with 5 additions and 4 deletions

View File

@ -56,13 +56,14 @@ AC_ARG_WITH(docs, [ --with-documentation build documentation for libcvautoma
AC_ARG_ENABLE(man, [ --enable-man enable building the 'man' pages for libcvautomation @<:@default=enable@:>@])
AC_ARG_ENABLE(tex, [ --enable-tex enable building the 'latex' pages for libcvautomation @<:@default=enable@:>@])
if test "$with_docs" != "no"; then
AC_CHECK_PROGS([Doxygen], [doxygen])
AC_CHECK_PROGS([Doxygen], [doxygen], [true])
if test -z "$Doxygen"; then
AC_MSG_WARN([Doxygen not found - continuing without building documentation.])
else
AM_CONDITIONAL(BUILD_DOXYGEN, [test "$with_docs" != "no"])
AC_CONFIG_FILES([docs/Doxyfile])
fi
AM_CONDITIONAL(BUILD_DOXYGEN, [test "$with_docs" != "no"])
AM_COND_IF(BUILD_DOXYGEN, [AC_CONFIG_FILES([docs/Doxyfile])])
#Check if we should generate man pages
if test "$enable_man" != "no"; then

View File

@ -2,7 +2,7 @@ if BUILD_DOXYGEN
EXTRA_DIST = html
install-data-local:
$(MKDIR_P) $(DESTDIR)$(datadir)/$(PACKAGE)/html
$(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/html
for f in html/*; do \
$(INSTALL_DATA) $(srcdir)/$$f \
$(DESTDIR)$(datadir)/$(PACKAGE)/html; done