Author: afester
Date: Tue Oct 17 23:51:44 2006
New Revision: 465160
URL: http://svn.apache.org/viewvc?view=rev&rev=465160
Log:
LOGCXX-157: added @manual_dest@ replacement variable to autoconf based build
Modified:
logging/log4cxx/trunk/configure.in
logging/log4cxx/trunk/docs/Makefile.am
Modified: logging/log4cxx/trunk/configure.in
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/configure.in?view=diff&rev=465160&r1=465159&r2=465160
==============================================================================
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Tue Oct 17 23:51:44 2006
@@ -92,9 +92,13 @@
else
enable_dot=yes
fi
+
+manual_dest="manual"
+
AC_SUBST(enable_dot)
AC_SUBST(enable_html_docs)
AC_SUBST(enable_latex_docs)
+AC_SUBST(manual_dest)
# CppUnit
Modified: logging/log4cxx/trunk/docs/Makefile.am
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/docs/Makefile.am?view=diff&rev=465160&r1=465159&r2=465160
==============================================================================
--- logging/log4cxx/trunk/docs/Makefile.am (original)
+++ logging/log4cxx/trunk/docs/Makefile.am Tue Oct 17 23:51:44 2006
@@ -6,18 +6,17 @@
if DOC
htmldir = $(pkgdatadir)/html
-#html_DATA = html/index.html
install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(htmldir)
- cp -dpR html/* $(DESTDIR)$(htmldir)
+ cp -dpR @manual_dest@/* $(DESTDIR)$(htmldir)
# Automake's "distcheck" is sensitive to having files left over
# after "make uninstall", so we have to clean up the install hook.
uninstall-local:
rm -rf $(DESTDIR)$(htmldir)
-dox: html/index.html
+dox: @manual_dest@/index.html
if LATEX_DOC
@@ -47,7 +46,7 @@
all-local: dox
-html/index.html: Doxyfile introduction.dox mainpage.dox
[EMAIL PROTECTED]@/index.html: Doxyfile introduction.dox mainpage.dox
"@DOXYGEN@"
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)
@@ -58,14 +57,14 @@
mkdir $(distdir)
mkdir $(distdir)/docs
mkdir $(distdir)/docs/html
- cp html/* $(distdir)/docs/html
+ cp @manual_dest@/* $(distdir)/docs/html
tar -czf $(top_builddir)/$(PACKAGE)-docs-$(VERSION).tar.gz -C
$(distdir) docs
rm -rf $(distdir)
clean-local:
$(RM) -r latex
- $(RM) -r html man @[EMAIL PROTECTED] @[EMAIL PROTECTED]
+ $(RM) -r @manual_dest@ man @[EMAIL PROTECTED] @[EMAIL PROTECTED]
dist-hook:
-rm -f $(distdir)/Doxyfile
