Makefile.in: Add install-html, install-html-am, and install-html-recursive targets.
libiberty/ 2006-04-06 Carlos O'Donell <carlos@codesourcery.com> * Makefile.in: Add install-html, install-html-am, and install-html-recursive targets. Define mkdir_p and NORMAL_INSTALL. * configure.ac: AC_SUBST datarootdir, docdir, htmldir. * configure: Regenerate. * testsuite/Makefile.in: Add install-html and html targets. From-SVN: r112741
This commit is contained in:
Carlos O'Donell
Carlos O'Donell
parent
8224ee206c
commit
cf61af07d9
|
|
@ -1,3 +1,12 @@
|
|||
2006-04-06 Carlos O'Donell <carlos@codesourcery.com>
|
||||
|
||||
* Makefile.in: Add install-html, install-html-am, and
|
||||
install-html-recursive targets. Define mkdir_p and
|
||||
NORMAL_INSTALL.
|
||||
* configure.ac: AC_SUBST datarootdir, docdir, htmldir.
|
||||
* configure: Regenerate.
|
||||
* testsuite/Makefile.in: Add install-html and html targets.
|
||||
|
||||
2006-03-31 Mark Mitchell <mark@codesourcery.com>
|
||||
|
||||
* pex-win32.c (<errno.h>): Include.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Makefile
|
||||
# Copyright (C) 1990, 91-99, 2000, 2001, 2002, 2003, 2004, 2005
|
||||
# Copyright (C) 1990, 91-99, 2000, 2001, 2002, 2003, 2004, 2005, 2006
|
||||
# Free Software Foundation
|
||||
#
|
||||
# This file is part of the libiberty library.
|
||||
|
|
@ -245,7 +245,62 @@ info: libiberty.info info-subdir
|
|||
install-info: install-info-subdir
|
||||
clean-info: clean-info-subdir
|
||||
dvi: libiberty.dvi dvi-subdir
|
||||
html: libiberty.html
|
||||
|
||||
# html, install-html targets
|
||||
HTMLS = libiberty.html
|
||||
|
||||
html: $(HTMLS)
|
||||
|
||||
.PHONY: install-html install-html-am install-html-recursive
|
||||
|
||||
NORMAL_INSTALL = :
|
||||
mkdir_p = mkdir -p --
|
||||
|
||||
html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
||||
|
||||
install-html: install-html-recursive install-html-am
|
||||
|
||||
install-html-am: $(HTMLS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(htmldir)" || $(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 " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
|
||||
$(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-html-recursive:
|
||||
@failcom='exit 1'; \
|
||||
for f in x $$MAKEFLAGS; do \
|
||||
case $$f in \
|
||||
*=* | --[!k]*);; \
|
||||
*k*) failcom='fail=yes';; \
|
||||
esac; \
|
||||
done; \
|
||||
dot_seen=no; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
echo "Making $$target in $$subdir"; \
|
||||
if test "$$subdir" = "."; then \
|
||||
dot_seen=yes; \
|
||||
local_target="$$target-am"; \
|
||||
else \
|
||||
local_target="$$target"; \
|
||||
fi; \
|
||||
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
||||
|| eval $$failcom; \
|
||||
done; \
|
||||
if test "$$dot_seen" = "no"; then \
|
||||
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
|
||||
fi; test -z "$$fail"
|
||||
|
||||
TEXISRC = \
|
||||
$(srcdir)/libiberty.texi \
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libiberty_topdir MAINT NOTMAINT MAKEINFO BUILD_INFO PERL HAVE_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os AR ac_ct_AR RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP ac_libiberty_warn_cflags NO_MINUS_C_MINUS_O OUTPUT_OPTION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA EGREP LIBOBJS CHECK target_header_dir pexecute INSTALL_DEST LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libiberty_topdir MAINT NOTMAINT MAKEINFO BUILD_INFO PERL HAVE_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os AR ac_ct_AR RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP ac_libiberty_warn_cflags NO_MINUS_C_MINUS_O OUTPUT_OPTION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA EGREP LIBOBJS CHECK target_header_dir pexecute INSTALL_DEST datarootdir docdir htmldir LTLIBOBJS'
|
||||
ac_subst_files='host_makefile_frag'
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -8677,6 +8677,10 @@ for l in x $LIBOBJS; do
|
|||
done
|
||||
LIBOBJS="$L"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# We need multilib support, but only if configuring for the target.
|
||||
ac_config_files="$ac_config_files Makefile testsuite/Makefile"
|
||||
|
||||
|
|
@ -9354,6 +9358,9 @@ s,@CHECK@,$CHECK,;t t
|
|||
s,@target_header_dir@,$target_header_dir,;t t
|
||||
s,@pexecute@,$pexecute,;t t
|
||||
s,@INSTALL_DEST@,$INSTALL_DEST,;t t
|
||||
s,@datarootdir@,$datarootdir,;t t
|
||||
s,@docdir@,$docdir,;t t
|
||||
s,@htmldir@,$htmldir,;t t
|
||||
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
||||
/@host_makefile_frag@/r $host_makefile_frag
|
||||
s,@host_makefile_frag@,,;t t
|
||||
|
|
|
|||
|
|
@ -639,6 +639,11 @@ for l in x $LIBOBJS; do
|
|||
done
|
||||
LIBOBJS="$L"
|
||||
|
||||
dnl Required by html and install-html
|
||||
AC_SUBST(datarootdir)
|
||||
AC_SUBST(docdir)
|
||||
AC_SUBST(htmldir)
|
||||
|
||||
# We need multilib support, but only if configuring for the target.
|
||||
AC_CONFIG_FILES([Makefile testsuite/Makefile])
|
||||
AC_CONFIG_COMMANDS([default],
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Makefile
|
||||
# Copyright (C) 1999, 2002
|
||||
# Copyright (C) 1999, 2002, 2006
|
||||
# Free Software Foundation
|
||||
#
|
||||
# This file is part of the libiberty library.
|
||||
|
|
@ -73,7 +73,7 @@ test-expandargv: $(srcdir)/test-expandargv.c ../libiberty.a
|
|||
$(srcdir)/test-expandargv.c ../libiberty.a
|
||||
|
||||
# Standard (either GNU or Cygnus) rules we don't use.
|
||||
info install-info clean-info dvi install etags tags installcheck:
|
||||
html install-html info install-info clean-info dvi install etags tags installcheck:
|
||||
|
||||
# The standard clean rules.
|
||||
mostlyclean:
|
||||
|
|
|
|||
Loading…
Reference in New Issue