mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-04-08 13:11:28 +08:00
Makefile.def: Add install-html target.
2006-05-24 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. From-SVN: r114048
This commit is contained in:
parent
740dfbde67
commit
65d6e99408
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
2006-05-24 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.
|
||||
|
||||
2006-05-24 Mark Shinwell <shinwell@codesourcery.com>
|
||||
|
||||
* configure.in: Enable gprof for cross builds.
|
||||
|
@ -154,6 +154,9 @@ recursive_targets = { make_target= TAGS;
|
||||
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; };
|
||||
@ -171,7 +174,10 @@ flags_to_pass = { flag= bindir ; };
|
||||
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 ; };
|
||||
|
2865
Makefile.in
2865
Makefile.in
File diff suppressed because it is too large
Load Diff
@ -53,6 +53,9 @@ libdir = @libdir@
|
||||
includedir = @includedir@
|
||||
oldincludedir = @oldincludedir@
|
||||
infodir = @infodir@
|
||||
datarootdir = @datarootdir@
|
||||
docdir = @docdir@
|
||||
htmldir = @htmldir@
|
||||
mandir = @mandir@
|
||||
man1dir = $(mandir)/man1
|
||||
man2dir = $(mandir)/man2
|
||||
@ -532,7 +535,7 @@ do-[+make_target+]:
|
||||
|
||||
# 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-info: do-install-info dir.info
|
||||
$(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
|
||||
|
||||
|
20
configure.in
20
configure.in
@ -1068,6 +1068,26 @@ fi
|
||||
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=
|
||||
|
Loading…
x
Reference in New Issue
Block a user