mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-03-19 12:21:15 +08:00
Makefile.in: Define HTMLS_BUILD, HTMLS_INSTALL, html__strip_dir, html__mkdir_p.
gcc/ 2006-06-13 Carlos O'Donell <carlos@codesourcery.com> * Makefile.in: Define HTMLS_BUILD, HTMLS_INSTALL, html__strip_dir, html__mkdir_p. Enhance install-html target. * configure.ac: AC_SUBST datarootdir, docdir and htmldir. * configure: Regenerate. From-SVN: r114620
This commit is contained in:
parent
6b4e957600
commit
9288b84507
@ -1,3 +1,10 @@
|
||||
2006-06-13 Carlos O'Donell <carlos@codesourcery.com>
|
||||
|
||||
* Makefile.in: Define HTMLS_BUILD, HTMLS_INSTALL,
|
||||
html__strip_dir, html__mkdir_p. Enhance install-html target.
|
||||
* configure.ac: AC_SUBST datarootdir, docdir and htmldir.
|
||||
* configure: Regenerate.
|
||||
|
||||
2006-06-13 Fariborz Jahanian <fjahanian@apple.com>
|
||||
|
||||
* fold-const.c (fold_cond_expr_with_comparison): Check for
|
||||
|
@ -511,7 +511,7 @@ tmpdir = /tmp
|
||||
|
||||
datarootdir = @datarootdir@
|
||||
docdir = @docdir@
|
||||
# Directory in which to bujild HTML
|
||||
# Directory in which to build HTML
|
||||
build_htmldir = $(objdir)/HTML/gcc-$(version)
|
||||
# Directory in which to put HTML
|
||||
htmldir = @htmldir@
|
||||
@ -3428,12 +3428,20 @@ doc/%.dvi: %.texi
|
||||
doc/gccinstall.dvi: $(TEXI_GCCINSTALL_FILES)
|
||||
$(TEXI2DVI) -I . -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
|
||||
|
||||
html:: $(build_htmldir)/cpp/index.html $(build_htmldir)/gcc/index.html \
|
||||
# List the directories or single hmtl files which are installed by
|
||||
# install-html. The lang.html file triggers language fragments to build
|
||||
# html documentation. Installing language fragment documentation is not
|
||||
# yet supported.
|
||||
HTMLS_INSTALL=$(build_htmldir)/cpp $(build_htmldir)/gcc \
|
||||
$(build_htmldir)/gccinstall $(build_htmldir)/gccint \
|
||||
$(build_htmldir)/cppinternals
|
||||
|
||||
# List the html file targets.
|
||||
HTMLS_BUILD=$(build_htmldir)/cpp/index.html $(build_htmldir)/gcc/index.html \
|
||||
$(build_htmldir)/gccinstall/index.html $(build_htmldir)/gccint/index.html \
|
||||
$(build_htmldir)/cppinternals/index.html lang.html
|
||||
|
||||
install-html:: installdirs
|
||||
cp -rp $(build_htmldir) $(DESTDIR)/$(htmldir)
|
||||
html:: $(HTMLS_BUILD)
|
||||
|
||||
$(build_htmldir)/%/index.html: %.texi
|
||||
$(mkinstalldirs) $(@D)
|
||||
@ -3734,6 +3742,26 @@ $(DESTDIR)$(infodir)/%.info: doc/%.info installdirs
|
||||
else true; fi; \
|
||||
else true; fi;
|
||||
|
||||
html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
||||
html__mkdir_p = mkdir -p --
|
||||
|
||||
install-html: $(HTMLS_BUILD)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(htmldir)" || $(html__mkdir_p) "$(DESTDIR)$(htmldir)"
|
||||
@list='$(HTMLS_INSTALL)'; 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) \
|
||||
|
377
gcc/configure
vendored
377
gcc/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -817,6 +817,10 @@ AC_ARG_ENABLE(languages,
|
||||
esac],
|
||||
[enable_languages=c])
|
||||
|
||||
# Used by documentation targets
|
||||
AC_SUBST(datarootdir)
|
||||
AC_SUBST(docdir)
|
||||
AC_SUBST(htmldir)
|
||||
|
||||
# -------------------------
|
||||
# Checks for other programs
|
||||
|
Loading…
x
Reference in New Issue
Block a user