Changeset 2487

Timestamp:

May 27, 2011, 4:55:25 PM (12 years ago)

Author:

Peter

Message:

Change the semantics of htmldir and where htlm docs are
installed. Before html was installed in ${htmldir}/html and ${htmldir}
was by default set to 'htmldir=${docdir}'. The current behavior is
that htmldir is defult set to 'htmldir=${docdir}/html' and html docs
are installed in ${htmldir}. Thus the default behavior is not changed,
i.e., docs are before and after this change installed in
${docdir}/html. This change leaves more flexibility to the user who can now
configure where to install the html output.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• doc/Makefile.am (modified) (2 diffs)

trunk/configure.ac

@@ -42 +42 @@
 AC_CONFIG_MACRO_DIR([m4])
 AC_PREFIX_DEFAULT([/usr/local])
+
+# Set default htmldir to ${docdir}/html
+AS_IF([test $htmldir = '${docdir}'], [htmldir='${docdir}/html']) 
 
 AC_SUBST([YAT_LT_VERSION], [YAT_LT_VERSION_INFO])

trunk/doc/Makefile.am

@@ -75 +75 @@
   @$(MAKE) $(AM_MAKEFLAGS) install-html
 
-uninstall-hook:
-  @$(NORMAL_UNINSTALL)
-  rm -rf $(DESTDIR)$(htmldir)/html
-
 installdirs-local:
-  $(MKDIR_P) "$(DESTDIR)$(htmldir)/html";
+  $(MKDIR_P) "$(DESTDIR)$(htmldir)";
 
 # local install rules does not generate any documentation, in order to
@@ -91 +87 @@
   @$(NORMAL_INSTALL)
   @if test -d $(DX_HTML_OUTPUT); then \
-    echo "$(MKDIR_P) $(DESTDIR)$(htmldir)/html"; \
-    $(MKDIR_P) $(DESTDIR)$(htmldir)/html;\
-    echo "$(INSTALL_DATA) $(DX_HTML_OUTPUT)/* $(DESTDIR)$(htmldir)/html";\
-    $(INSTALL_DATA) $(DX_HTML_OUTPUT)/* $(DESTDIR)$(htmldir)/html; \
+    echo "$(MKDIR_P) $(DESTDIR)$(htmldir)"; \
+    $(MKDIR_P) $(DESTDIR)$(htmldir);\
+    echo "$(INSTALL_DATA) $(DX_HTML_OUTPUT)/* $(DESTDIR)$(htmldir)";\
+    $(INSTALL_DATA) $(DX_HTML_OUTPUT)/* $(DESTDIR)$(htmldir); \
   fi