diff options
author | Carlos O'Donell <carlos@codesourcery.com> | 2006-04-03 19:44:46 +0400 |
---|---|---|
committer | Carlos O'Donell <carlos@codesourcery.com> | 2006-04-03 19:44:46 +0400 |
commit | 30c2380d584c56bcf9e5351276e58402c0e04de2 (patch) | |
tree | 7a1ba4f6cf02aeab376190d360651c2843987a91 /etc | |
parent | d4b522efa8f45a4ca7ea1e72bb2976bc01a804c4 (diff) |
2006-04-03 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.
* opcodes/Makefile.am: Add install-html target.
* opcodes/Makefile.in: Regenerate.
* libiberty/Makefile.in: Add install-html, install-html-am, and
install-html-recursive targets. Define mkdir_p and
NORMAL_INSTALL.
* libiberty/configure.ac: AC_SUBST datarootdir, docdir, htmldir.
* libiberty/configure: Regenerate.
* libiberty/testsuite/Makefile.in: Add install-html and html targets.
* ld/Makefile.am: Add install-html, install-html-am, and
install-html-recursive targets.
* ld/Makefile.in: Regenerate.
* ld/configure.in: AC_SUBST datarootdir, docdir, htmldir.
* ld/configure: Regenerate.
* ld/po/Make-in: Add install-html target.
* intl/Makefile.in: Add html info and dvi and install-html to .PHONY
Add install-html target.
* gprof/po/Make-in: Add install-html target.
* gprof/Makefile.am: Add install-html, install-html-am and
install-html-recursive targets.
* gprof/Makefile.in: Regenerate.
* gprof/configure.in: AC_SUBST datarootdir, docdir, htmldir.
* gprof/configure: Regenerate.
* gas/po/Make-in: Add install-html target.
* gas/Makefile.am: Add install-html and install-html-recursive targets.
* gas/Makefile.in: Regenerate.
* gas/configure.in: AC_SUBST datarootdir, docdir, htmldir.
* gas/configure: Regenerate.
* gas/doc/Makefile.am: Add install-html and install-html-am targets.
* gas/doc/Makefile.in: Regenerate.
* binutils/po/Make-in: Add install-html target.
* binutils/Makefile.am: Add install-html and install-html-recursive targets.
* binutils/Makefile.in: Regenerate.
* binutils/configure.in: AC_SUBST datarootdir, docdir and htmldir.
* binutils/configure: Regenerate.
* binutils/doc/Makefile.am: Add install-html and install-html-am targets.
* binutils/doc/Makefile.in: Regenerate.
* bfd/po/Make-in: Add install-html target.
* bfd/Makefile.am: Rename docdir to bfddocdir. Add datarootdir, docdir
htmldir. Add install-html and install-html-recursive targets.
* bfd/Makefile.in: Regenerate.
* bfd/configure.in: AC_SUBST for datarootdir, docdir and htmldir.
* bfd/configure: Regenerate.
* bfd/doc/Makefile.am: Add install-html and install-html-am targets.
Define datarootdir, docdir and htmldir.
* bfd/doc/Makefile.in: Regenerate.
* etc/Makefile.in: Add install-html target. Add htmldir,
docdir and datarootdir.
* etc/configure.texi: Document install-html target.
* etc/configure.in: AC_SUBST datarootdir, docdir, htmldir.
* etc/configure: Regenerate.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/Makefile.in | 17 | ||||
-rwxr-xr-x | etc/configure | 65 | ||||
-rw-r--r-- | etc/configure.in | 5 | ||||
-rw-r--r-- | etc/configure.texi | 4 |
4 files changed, 74 insertions, 17 deletions
diff --git a/etc/Makefile.in b/etc/Makefile.in index df461cfd5..7d0607d96 100644 --- a/etc/Makefile.in +++ b/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 \ diff --git a/etc/configure b/etc/configure index 101fcefec..c2e1ad1e3 100755 --- a/etc/configure +++ b/etc/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12.1 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -333,7 +333,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12.1" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -503,9 +503,11 @@ ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross +ac_exeext= +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -551,12 +553,12 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:555: checking for a BSD compatible install" >&5 +echo "configure:557: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in @@ -599,9 +601,16 @@ echo "$ac_t""$INSTALL" 1>&6 # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + + + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -625,7 +634,7 @@ EOF # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1 | grep ac_space` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -668,15 +677,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. @@ -704,7 +732,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.12.1" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -728,6 +756,7 @@ s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g @@ -747,7 +776,11 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@datarootdir@%$datarootdir%g +s%@docdir@%$docdir%g +s%@htmldir@%$htmldir%g CEOF EOF diff --git a/etc/configure.in b/etc/configure.in index b78506800..38bc65902 100644 --- a/etc/configure.in +++ b/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) diff --git a/etc/configure.texi b/etc/configure.texi index 385a7c447..58c528548 100644 --- a/etc/configure.texi +++ b/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 |