From: bangerth Date: Sat, 15 Jan 2011 20:39:57 +0000 (+0000) Subject: Take over r23195 from mainline: Do not substitute in files in the doc/ directory... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7374c234a88b6622245b15b724f7356025d141ec;p=dealii-svn.git Take over r23195 from mainline: Do not substitute in files in the doc/ directory if the directory isn't there. This may happen when people download the .nodoc tar files. git-svn-id: https://svn.dealii.org/branches/releases/Branch-7-0@23196 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/configure b/deal.II/configure index c7cf28d4f6..22ee65a326 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -13058,6 +13058,10 @@ process_files="common/Make.global_options common/scripts/make_dependencies.pl common/scripts/make_todo.pl Version + common/template-arguments" + +if test -d doc ; then + process_files="${process_files} doc/Makefile doc/title.html doc/doxygen/Makefile @@ -13065,8 +13069,9 @@ process_files="common/Make.global_options doc/doxygen/options.136 doc/doxygen/header.html doc/doxygen/header.136 - doc/doxygen/header.tex - common/template-arguments" + doc/doxygen/header.tex" +fi + ac_config_files="$ac_config_files $process_files" diff --git a/deal.II/configure.in b/deal.II/configure.in index a99702fa03..6e33f004b9 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -836,6 +836,13 @@ process_files="common/Make.global_options common/scripts/make_dependencies.pl common/scripts/make_todo.pl Version + common/template-arguments" + +dnl Also replace stuff in the doc/ files, but we can't rely on +dnl their presence because we package the .nodoc.tar.gz files +dnl that omit the entire doc/ directory. +if test -d doc ; then + process_files="${process_files} doc/Makefile doc/title.html doc/doxygen/Makefile @@ -843,8 +850,9 @@ process_files="common/Make.global_options doc/doxygen/options.136 doc/doxygen/header.html doc/doxygen/header.136 - doc/doxygen/header.tex - common/template-arguments" + doc/doxygen/header.tex" +fi + AC_CONFIG_FILES([$process_files]) AC_OUTPUT