Browse Source

2006-04-06 Carlos O'Donell <carlos@codesourcery.com>


			
			
				sh3port_dev
			
			
		
Carlos O'Donell 16 years ago
parent
commit
83c9add4a9
  1. 9
      ChangeLog
  2. 6
      Makefile.def
  3. 2506
      Makefile.in
  4. 7
      Makefile.tpl
  5. 354
      configure
  6. 20
      configure.in
  7. 8
      etc/ChangeLog
  8. 17
      etc/Makefile.in
  9. 2278
      etc/configure
  10. 5
      etc/configure.in
  11. 4
      etc/configure.texi

9
ChangeLog

@ -1,3 +1,12 @@
2006-04-06 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.tpl: Add install-html target.
* Makefile.def: Add install-html target.
* Makefile.in: Regenerate.
* configure.in: Add --with-datarootdir, --with-docdir,
and --with-htmldir options.
* configure: Regenerate.
2006-03-31 Ben Elliston <bje@au.ibm.com>
PR binutils/1860

6
Makefile.def

@ -155,6 +155,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; };
@ -172,7 +175,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 ; };

2506
Makefile.in
File diff suppressed because it is too large
View File

7
Makefile.tpl

@ -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

354
configure
File diff suppressed because it is too large
View File

20
configure.in

@ -2384,4 +2384,24 @@ case ${enable_werror} in
esac
AC_SUBST(stage2_werror_flag)
# Flags needed to enable html installing and building
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)
AC_OUTPUT(Makefile)

8
etc/ChangeLog

@ -1,3 +1,11 @@
2006-04-06 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Add install-html target. Add htmldir,
docdir and datarootdir.
* configure.texi: Document install-html target.
* configure.in: AC_SUBST datarootdir, docdir, htmldir.
* configure: Regenerate.
2006-02-27 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: TEXI2HTML uses makeinfo. Define

17
etc/Makefile.in

@ -25,7 +25,10 @@ man6dir = $(mandir)/man6
man7dir = $(mandir)/man7
man8dir = $(mandir)/man8
man9dir = $(mandir)/man9
datarootdir = @datarootdir@
docdir = @docdir@
infodir = @infodir@
htmldir = @htmldir@
SHELL = /bin/sh
@ -97,6 +100,20 @@ html:
fi; \
done
install-html: html
$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(htmldir)
if test ! -f standards.html; then cd $(srcdir); fi; \
if test -f standards.html; then \
for i in standards.html*; do \
$(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i; \
done; \
fi
if test ! -f configure.html; then cd $(srcdir); fi; \
if test -f configure.html; then \
for i in configure.html*; do \
$(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i; \
done; \
fi
dvi:
for f in $(DVIFILES); do \

2278
etc/configure
File diff suppressed because it is too large
View File

5
etc/configure.in

@ -4,4 +4,9 @@ AC_INIT(Makefile.in)
AC_PROG_INSTALL
AC_SUBST(datarootdir)
AC_SUBST(docdir)
AC_SUBST(htmldir)
AC_OUTPUT(Makefile)

4
etc/configure.texi

@ -276,7 +276,9 @@ directory is controlled by @samp{configure} options, as described below.
In the Cygnus tree at present, the info files are built and installed as
a separate step. To build them, run @samp{make info}. To install them,
run @samp{make install-info}.
run @samp{make install-info}. The equivalent html files are also built
and installed in a separate step. To build the html files, run
@samp{make html}. To install the html files run @samp{make install-html}.
All @samp{configure} scripts support a wide variety of options. The
most interesting ones are @samp{--with} and @samp{--enable} options

Loading…
Cancel
Save