This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] Add support for html/install-html.
- From: Carlos O'Donell <carlos at codesourcery dot com>
- To: gcc-patches at gnu dot org
- Cc: dj at redhat dot com, neroden at gcc dot gnu dot org, aoliva at redhat dot com
- Date: Fri, 19 May 2006 22:01:39 -0400
- Subject: [PATCH] Add support for html/install-html.
The following patch adds "make html" and "make install-html" support.
Tested with the following enabled languages: c, ada, c++, fortran, java,
objc, obj-c++, and treelang.
Three top-level options are added to support "make install-html" for
locations other than the default path. The options follow the GNU Coding
Stanards [1]:
--with-datarootdir Use datarootdir as the data root directory.
--with-docdir Install documentation in this directory.
--with-htmldir Install html in this directory.
"make install" produces the following documentation by default:
Starting Page:
./share/doc/cpp/index.html
./share/doc/gcc/index.html
./share/doc/gccint/index.html
./share/doc/cppinternals/index.html
./share/doc/gccinstall/index.html
./share/doc/libiberty.html
Tested on x86-pc-linux-gnu with no regressions.
Notes:
- The "zlib" directory is intentionally left "as-is."
- Some html files are currently not installed.
- The gccinstall manual is empty.
- The value of $(unstage) expects the stages to already be present.
Executing "make html" or "make install-html" as the first command
is broken (the same goes for info).
OK to checkin?
Cheers,
Carlos.
--
Carlos O'Donell
CodeSourcery
carlos@codesourcery.com
(650) 331-3385 x716
[1] http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.def: Add install-html target. Add datarootdir
docdir and htmldir to flags_to_pass.
* Makefile.tpl: Add install-html target.
* Makefile.in: Regenerate.
* configure.in: Add --with-datarootdir, --with-docdir, and
--with-htmldir options. AC_SUBST datarootdir, docdir and htmldir.
* configure: Regenerate.
libgomp/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.am: Add install-html target. Add install-html to .PHONY
* Makefile.in: Regenerate.
libdecnumber/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Add install-html target. Add install-html to .PHONY
gcc/java/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Make-lang.in: Rename htmldir to gcc_htmldir.
gcc/fortran/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Make-lang.in: Rename htmldir to gcc_htmldir.
gcc/treelang/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Make-lang.in: Rename htmldir to gcc_htmldir.
gcc/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Rename htmldir to gcc_htmldir.
Define HTMLS, html__strip_dir, html__mkdir_p.
Add install-html target.
* configure.ac: AC_SUBST datarootdir, docdir and htmldir.
* configure: Regenerate.
libstdc++-v3/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.am: Add install-html target. Add install-html to .PHONY
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* include/Makefile.in: Regenerate.
* libmath/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
libobjc/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Add install-html target. Add install-html to .PHONY
intl/
2005-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Add info dvi ps pdf html install-html to .PHONY
Add install-html target.
libgfortran/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.am: Add install-html target. Add install-html to .PHONY
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
libada/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Add install-html target.
libmudflap/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.am: Add install-html target. Add install-html to .PHONY
* Makefile.in: Regenerate.
boehm-gc/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.am: Add install-html target.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* include/Makefile.in: Regenerate.
libffi/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.am: Add install-html target. Add install-html to .PHONY
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* include/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
libssp/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.am: Add install-html target. Add install-html to .PHONY
* Makefile.in: Regenerate.
libjava/classpath/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* native/jni/java-lang/Makefile.in: Regenerate.
* native/jni/midi-alsa/Makefile.in: Regenerate.
* native/jni/classpath/Makefile.in: Regenerate.
* native/jni/midi-dssi/Makefile.in: Regenerate.
* native/jni/Makefile.in: Regenerate.
* native/jni/java-nio/Makefile.in: Regenerate.
* native/jni/java-net/Makefile.in: Regenerate.
* native/jni/java-io/Makefile.in: Regenerate.
* native/jni/xmlj/Makefile.in: Regenerate.
* native/jni/java-util/Makefile.in: Regenerate.
* native/jni/qt-peer/Makefile.in: Regenerate.
* native/jni/gtk-peer/Makefile.in: Regenerate.
* native/Makefile.in: Regenerate.
* native/jawt/Makefile.in: Regenerate.
* native/target/Linux/Makefile.in: Regenerate.
* native/target/Makefile.in: Regenerate.
* native/target/generic/Makefile.in: Regenerate.
* native/fdlibm/Makefile.in: Regenerate.
* resource/Makefile.in: Regenerate.
* scripts/Makefile.in: Regenerate.
* tools/Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
* doc/api/Makefile.in: Regenerate.
* doc/api/Makefile.am: Build documentation if $(GJDOC) is present.
* lib/Makefile.in: Regenerate.
* external/Makefile.in: Regenerate.
* external/sax/Makefile.in: Regenerate.
* external/w3c_dom/Makefile.in: Regenerate.
* external/relaxngDatatype/Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* examples/Makefile.in: Regenerate.
libjava/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.am: Add install-html target. Add install-html to .PHONY
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* gcj/Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
libcpp/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Add install-html target. Add install-html to .PHONY
gnattools/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Add html and install-html targets.
libgcc-math/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com
* Makefile.am: Add install-html target.
Add install-html and $(version_dep) to .PHONY
* Makefile.in: Regenerate.
fixincludes/
2006-05-19 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Add dvi info html and install-html to .PHONY
Add install-html target.
Index: libgomp/Makefile.am
===================================================================
--- libgomp/Makefile.am (revision 113913)
+++ libgomp/Makefile.am (working copy)
@@ -48,3 +48,8 @@
fortran.o: libgomp_f.h
env.lo: libgomp_f.h
env.o: libgomp_f.h
+
+# No install-html target
+.PHONY: install-html
+install-html:
+
Index: libdecnumber/Makefile.in
===================================================================
--- libdecnumber/Makefile.in (revision 113913)
+++ libdecnumber/Makefile.in (working copy)
@@ -136,11 +136,12 @@
info:
install-info:
install-man:
+install-html:
install:
.PHONY: installdirs install install-strip mostlyclean clean distclean \
maintainer-clean check installcheck dvi html info install-info \
- install-man update-po
+ install-man update-po install-html
COMPILE = source='$<' object='$@' libtool=no $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(ALL_CFLAGS) -c
Index: gcc/java/Make-lang.in
===================================================================
--- gcc/java/Make-lang.in (revision 113913)
+++ gcc/java/Make-lang.in (working copy)
@@ -177,7 +177,7 @@
-cp -p $^ $(srcdir)/doc
java.dvi: doc/gcj.dvi
-java.html: $(htmldir)/java/index.html
+java.html: $(gcc_htmldir)/java/index.html
JAVA_MANFILES = doc/gcj.1 doc/gcjh.1 doc/jv-scan.1 doc/jcf-dump.1 doc/gij.1 \
doc/jv-convert.1 doc/grmic.1 doc/grmiregistry.1 \
doc/gcj-dbtool.1 doc/gjnih.1
@@ -394,7 +394,7 @@
doc/gcj.dvi: $(TEXI_JAVA_FILES)
$(TEXI2DVI) -I $(abs_docdir)/include -o $@ $<
-$(htmldir)/java/index.html: $(TEXI_JAVA_FILES)
+$(gcc_htmldir)/java/index.html: $(TEXI_JAVA_FILES)
$(mkinstalldirs) $(@D)
rm -f $(@D)/*
$(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/java -o $(@D) $<
Index: gcc/fortran/Make-lang.in
===================================================================
--- gcc/fortran/Make-lang.in (revision 113913)
+++ gcc/fortran/Make-lang.in (working copy)
@@ -127,7 +127,7 @@
fortran.info: doc/gfortran.info
fortran.dvi: doc/gfortran.dvi
-fortran.html: $(htmldir)/gfortran/index.html
+fortran.html: $(gcc_htmldir)/gfortran/index.html
F95_MANFILES = doc/gfortran.1
@@ -162,7 +162,7 @@
doc/gfortran.dvi: $(GFORTRAN_TEXI)
$(TEXI2DVI) -I $(srcdir)/fortran -I $(abs_docdir)/include -o $@ $<
-$(htmldir)/gfortran/index.html: $(GFORTRAN_TEXI)
+$(gcc_htmldir)/gfortran/index.html: $(GFORTRAN_TEXI)
$(mkinstalldirs) $(@D)
rm -f $(@D)/*
$(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/fortran -o $(@D) $<
Index: gcc/treelang/Make-lang.in
===================================================================
--- gcc/treelang/Make-lang.in (revision 113913)
+++ gcc/treelang/Make-lang.in (working copy)
@@ -173,9 +173,9 @@
doc/treelang.dvi: $(TEXI_TREELANG_FILES)
$(TEXI2DVI) -I $(abs_docdir)/include -o $@ $<
-treelang.html: $(htmldir)/treelang/index.html
+treelang.html: $(gcc_htmldir)/treelang/index.html
-$(htmldir)/treelang/index.html: $(TEXI_TREELANG_FILES)
+$(gcc_htmldir)/treelang/index.html: $(TEXI_TREELANG_FILES)
$(mkinstalldirs) $(@D)
rm -f $(@D)/*
$(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/treelang -o $(@D) $<
Index: gcc/Makefile.in
===================================================================
--- gcc/Makefile.in (revision 113913)
+++ gcc/Makefile.in (working copy)
@@ -510,7 +510,7 @@
tmpdir = /tmp
# Directory in which to put HTML
-htmldir = $(objdir)/HTML/gcc-$(version)
+gcc_htmldir = $(objdir)/HTML/gcc-$(version)
# Whether we were configured with NLS.
USE_NLS = @USE_NLS@
@@ -3409,10 +3409,10 @@
doc/gccint.dvi: $(TEXI_GCCINT_FILES)
doc/cppinternals.dvi: $(TEXI_CPPINT_FILES)
-$(htmldir)/cpp/index.html: $(TEXI_CPP_FILES)
-$(htmldir)/gcc/index.html: $(TEXI_GCC_FILES)
-$(htmldir)/gccint/index.html: $(TEXI_GCCINT_FILES)
-$(htmldir)/cppinternals/index.html: $(TEXI_CPPINT_FILES)
+$(gcc_htmldir)/cpp: $(TEXI_CPP_FILES)
+$(gcc_htmldir)/gcc: $(TEXI_GCC_FILES)
+$(gcc_htmldir)/gccint: $(TEXI_GCCINT_FILES)
+$(gcc_htmldir)/cppinternals: $(TEXI_CPPINT_FILES)
dvi:: doc/gcc.dvi doc/gccint.dvi doc/gccinstall.dvi doc/cpp.dvi \
doc/cppinternals.dvi lang.dvi
@@ -3424,20 +3424,25 @@
doc/gccinstall.dvi: $(TEXI_GCCINSTALL_FILES)
$(TEXI2DVI) -I . -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
-html:: $(htmldir)/cpp/index.html $(htmldir)/gcc/index.html \
- $(htmldir)/gccinstall/index.html $(htmldir)/gccint/index.html \
- $(htmldir)/cppinternals/index.html lang.html
+HTMLS= $(gcc_htmldir)/cpp $(gcc_htmldir)/gcc \
+ $(gcc_htmldir)/gccinstall $(gcc_htmldir)/gccint \
+ $(gcc_htmldir)/cppinternals
-$(htmldir)/%/index.html: %.texi
+# Note: lang.html is a special target which triggers language fragment
+# html builds. It is not included in HTMLS because we do not install
+# language html files.
+html:: $(HTMLS) lang.html
+
+$(gcc_htmldir)/%: %.texi
$(mkinstalldirs) $(@D)
- rm -f $(@D)/*
- $(TEXI2HTML) -I $(abs_docdir) -I $(abs_docdir)/include -o $(@D) $<
+ rm -f $(@)/*
+ $(TEXI2HTML) -I $(abs_docdir) -I $(abs_docdir)/include -o $(@) $<
# Duplicate entry to handle renaming of gccinstall
-$(htmldir)/gccinstall/index.html: $(TEXI_GCCINSTALL_FILES)
+$(gcc_htmldir)/gccinstall: $(TEXI_GCCINSTALL_FILES)
$(mkinstalldirs) $(@D)
- echo rm -f $(@D)/*
- $(TEXI2HTML) -I $(abs_docdir) -I $(abs_docdir)/include -o $(@D) $<
+ echo rm -f $(@)/*
+ $(TEXI2HTML) -I $(abs_docdir) -I $(abs_docdir)/include -o $(@) $<
MANFILES = doc/gcov.1 doc/cpp.1 doc/gcc.1 doc/gfdl.7 doc/gpl.7 doc/fsf-funding.7
@@ -3727,6 +3732,26 @@
else true; fi; \
else true; fi;
+html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+html__mkdir_p = mkdir -p --
+
+install-html: $(HTMLS)
+ @$(NORMAL_INSTALL)
+ test -z "$(htmldir)" || $(html__mkdir_p) "$(DESTDIR)$(htmldir)"
+ @list='$(HTMLS)'; for p in $$list; do \
+ if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
+ f=$(html__strip_dir) \
+ if test -d "$$d$$p"; then \
+ echo " $(html__mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(html__mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+ echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
+ else \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+ fi; \
+ done
+
# Install the man pages.
install-man: lang.install-man \
$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) \
Index: gcc/configure.ac
===================================================================
--- gcc/configure.ac (revision 113913)
+++ gcc/configure.ac (working copy)
@@ -817,6 +817,10 @@
esac],
[enable_languages=c])
+# Used by documentation targets
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
# -------------------------
# Checks for other programs
Index: libstdc++-v3/Makefile.am
===================================================================
--- libstdc++-v3/Makefile.am (revision 113913)
+++ libstdc++-v3/Makefile.am (working copy)
@@ -110,3 +110,11 @@
# Subdir rules rely on $(FLAGS_TO_PASS)
FLAGS_TO_PASS = $(AM_MAKEFLAGS)
+
+# Install distribution html documentation, doxygen documentation
+# also needs install.
+
+.PHONY: install-html
+
+install-html:
+
Index: libobjc/Makefile.in
===================================================================
--- libobjc/Makefile.in (revision 113913)
+++ libobjc/Makefile.in (working copy)
@@ -269,6 +269,10 @@
doc: info dvi html
+# No install-html support
+.PHONY: install-html
+install-html:
+
libobjc$(libext).la: $(OBJS)
$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \
-rpath $(toolexeclibdir) \
Index: intl/Makefile.in
===================================================================
--- intl/Makefile.in (revision 113913)
+++ intl/Makefile.in (working copy)
@@ -148,7 +148,10 @@
installcheck:
uninstall:
+.PHONY: info dvi ps pdf html install-html
+
info dvi ps pdf html:
+install-html:
$(OBJECTS): config.h libintl.h
bindtextdom.o dcgettext.o dcigettext.o dcngettext.o dgettext.o \
Index: libgfortran/Makefile.am
===================================================================
--- libgfortran/Makefile.am (revision 113913)
+++ libgfortran/Makefile.am (working copy)
@@ -579,6 +579,10 @@
intrinsics/dprod_r8.f90 \
intrinsics/f2c_specifics.F90
+# No install-html support yet.
+.PHONY: install-html
+install-html:
+
# Turn on vectorization and loop unrolling for matmul.
$(patsubst %.c,%.lo,$(notdir $(i_matmul_c))): AM_CFLAGS += -ftree-vectorize -funroll-loops
# Logical matmul doesn't vectorize.
Index: libada/Makefile.in
===================================================================
--- libada/Makefile.in (revision 113913)
+++ libada/Makefile.in (working copy)
@@ -127,6 +127,8 @@
install-info:
+install-html:
+
# Cleaning rules.
mostlyclean:
Index: libmudflap/Makefile.am
===================================================================
--- libmudflap/Makefile.am (revision 113913)
+++ libmudflap/Makefile.am (working copy)
@@ -105,5 +105,9 @@
MAKEOVERRIDES=
+.PHONY: install-html
+
+install-html:
+
## ################################################################
Index: boehm-gc/Makefile.am
===================================================================
--- boehm-gc/Makefile.am (revision 113913)
+++ boehm-gc/Makefile.am (working copy)
@@ -110,3 +110,8 @@
CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
MAKEOVERRIDES=
+
+# No install-html support yet
+.PHONY: install-html
+install-html:
+
Index: libffi/Makefile.am
===================================================================
--- libffi/Makefile.am (revision 113913)
+++ libffi/Makefile.am (working copy)
@@ -158,3 +158,8 @@
AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
AM_CCASFLAGS = $(AM_CPPFLAGS)
+
+# No install-html support
+.PHONY: install-html
+install-html:
+
Index: libssp/Makefile.am
===================================================================
--- libssp/Makefile.am (revision 113913)
+++ libssp/Makefile.am (working copy)
@@ -90,5 +90,9 @@
MAKEOVERRIDES=
+.PHONY: install-html
+
+install-html:
+
## ################################################################
Index: libjava/classpath/doc/api/Makefile.am
===================================================================
--- libjava/classpath/doc/api/Makefile.am (revision 113913)
+++ libjava/classpath/doc/api/Makefile.am (working copy)
@@ -35,19 +35,23 @@
-rm -rf html create_html gjdoc_rawcomment.cache
create_html:
- -$(MKDIR) html > /dev/null 2>&1
- $(GJDOC) \
- -use \
- -sourcepath "$(sourcepath)" \
- -encoding UTF-8 \
- -breakiterator \
- -licensetext \
- -linksource \
- -splitindex \
- -validhtml \
- -d html \
- -doctitle "GNU Classpath $(VERSION)" \
- -windowtitle "GNU Classpath $(VERSION) Documentation" \
- -header $(classpathbox) -footer $(classpathbox) \
- -subpackages java:javax:org
- touch create_html
+ if ! test -z "$(GJDOC)"; then \
+ -$(MKDIR) html > /dev/null 2>&1; \
+ $(GJDOC) \
+ -use \
+ -sourcepath "$(sourcepath)" \
+ -encoding UTF-8 \
+ -breakiterator \
+ -licensetext \
+ -linksource \
+ -splitindex \
+ -d html \
+ -doctitle "GNU Classpath $(VERSION)" \
+ -windowtitle "GNU Classpath $(VERSION) Documentation" \
+ -header $(classpathbox) -footer $(classpathbox) \
+ -subpackages java:javax:org; \
+ touch "create_html"; \
+ else \
+ echo "GJDOC not enabled. HTML files not built."; \
+ fi;
+
Index: libjava/Makefile.am
===================================================================
--- libjava/Makefile.am (revision 113913)
+++ libjava/Makefile.am (working copy)
@@ -982,6 +982,10 @@
MAKEOVERRIDES=
+# No install-html support yet.
+.PHONY: install-html
+install-html:
+
# Multilib support variables.
MULTISRCTOP =
MULTIBUILDTOP =
Index: libcpp/Makefile.in
===================================================================
--- libcpp/Makefile.in (revision 113913)
+++ libcpp/Makefile.in (working copy)
@@ -184,12 +184,13 @@
info:
install-info:
install-man:
+install-html:
update-po: $(CATALOGS:.gmo=.pox)
.PHONY: installdirs install install-strip mostlyclean clean distclean \
maintainer-clean check installcheck dvi html info install-info \
- install-man update-po
+ install-man update-po install-html
# Dependency rule.
COMPILE.base = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(ALL_CFLAGS) -c
Index: gnattools/Makefile.in
===================================================================
--- gnattools/Makefile.in (revision 113913)
+++ gnattools/Makefile.in (working copy)
@@ -302,6 +302,9 @@
# Build DVI (none here).
dvi:
+# Build HTML (none here).
+html:
+
# Build TAGS (none here).
TAGS:
@@ -310,6 +313,8 @@
install-info:
+install-html:
+
# Cleaning rules.
mostlyclean:
Index: libgcc-math/Makefile.am
===================================================================
--- libgcc-math/Makefile.am (revision 113913)
+++ libgcc-math/Makefile.am (working copy)
@@ -16,7 +16,6 @@
if LIBGCCM_USE_SYMVER
version_arg = -Wl,--version-script=gccm.map
version_dep = gccm.map
-.PHONY: gccm.map
gccm.map:
rm -f gccm.map
for map in @arch_maps@; do \
@@ -27,6 +26,9 @@
version_dep =
endif
+.PHONY: install-html $(version_dep)
+# No install-html target
+install-html:
if BUILD_LIBGCC_MATH
toolexeclib_LTLIBRARIES = libgcc-math.la
Index: fixincludes/Makefile.in
===================================================================
--- fixincludes/Makefile.in (revision 113913)
+++ fixincludes/Makefile.in (working copy)
@@ -184,7 +184,10 @@
$(DESTDIR)$(itoolsdir)/fixincl@EXEEXT@
$(INSTALL_SCRIPT) mkheaders $(DESTDIR)$(itoolsdir)/mkheaders
+.PHONY: dvi info html install-html
+
dvi :
info :
html :
+install-html :
installcheck :
Index: Makefile.def
===================================================================
--- Makefile.def (revision 113913)
+++ Makefile.def (working copy)
@@ -155,6 +155,9 @@
recursive_targets = { make_target= install-info;
depend=configure;
depend=info; };
+recursive_targets = { make_target= install-html;
+ depend=configure;
+ depend=html; };
recursive_targets = { make_target= installcheck;
depend=configure; };
recursive_targets = { make_target= mostlyclean; };
@@ -172,7 +175,10 @@
flags_to_pass = { flag= datadir ; };
flags_to_pass = { flag= exec_prefix ; };
flags_to_pass = { flag= includedir ; };
+flags_to_pass = { flag= datarootdir ; };
+flags_to_pass = { flag= docdir ; };
flags_to_pass = { flag= infodir ; };
+flags_to_pass = { flag= htmldir ; };
flags_to_pass = { flag= libdir ; };
flags_to_pass = { flag= libexecdir ; };
flags_to_pass = { flag= lispdir ; };
Index: Makefile.tpl
===================================================================
--- Makefile.tpl (revision 113913)
+++ Makefile.tpl (working copy)
@@ -53,6 +53,9 @@
includedir = @includedir@
oldincludedir = @oldincludedir@
infodir = @infodir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+htmldir = @htmldir@
mandir = @mandir@
man1dir = $(mandir)/man1
man2dir = $(mandir)/man2
@@ -532,7 +535,7 @@
# Here are the targets which correspond to the do-X targets.
-.PHONY: info installcheck dvi html install-info
+.PHONY: info installcheck dvi html install-info install-html
.PHONY: clean distclean mostlyclean maintainer-clean realclean
.PHONY: local-clean local-distclean local-maintainer-clean
info: do-info
@@ -550,6 +553,8 @@
$(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
else true ; fi
+install-html: do-install-html
+
local-clean:
-rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E *.log
Index: configure.in
===================================================================
--- configure.in (revision 113913)
+++ configure.in (working copy)
@@ -1078,6 +1078,26 @@
ACX_PROG_GNAT
ACX_PROG_CMP_IGNORE_INITIAL
+# Check for html and install-html
+AC_ARG_WITH(datarootdir,
+[ --with-datarootdir Use datarootdir as the data root directory.],
+[datarootdir="\${prefix}/${withval}"],
+[datarootdir="\${prefix}/share"])
+
+AC_ARG_WITH(docdir,
+[ --with-docdir Install documentation in this directory.],
+[docdir="\${prefix}/${withval}"],
+[docdir="\${datarootdir}/doc"])
+
+AC_ARG_WITH(htmldir,
+[ --with-htmldir Install html in this directory.],
+[htmldir="\${prefix}/${withval}"],
+[htmldir="\${docdir}"])
+
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
+
# Check for GMP and MPFR
gmplibs=
gmpinc=