From: Phil Edwards Date: Tue, 2 Apr 2002 12:57:23 +0000 (+0000) Subject: Makefile.am (install-data-local): Use mkinstalldirs. X-Git-Tag: releases/gcc-3.3.0~5953 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3741b1abe061fd59049b502f255337537986f15d;p=thirdparty%2Fgcc.git Makefile.am (install-data-local): Use mkinstalldirs. 2002-04-02 Phil Edwards * include/Makefile.am (install-data-local): Use mkinstalldirs. * include/Makefile.in: Regenerate. From-SVN: r51747 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a2fcd532eee3..b61a6997c815 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2002-04-02 Phil Edwards + + * include/Makefile.am (install-data-local): Use mkinstalldirs. + * include/Makefile.in: Regenerate. + 2002-04-02 Paolo Carlini Nathan Myers Philip Martin diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 545582ab0555..cfeb03e181ff 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -417,33 +417,33 @@ ${target_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcpp_thread_h} \ # tree using only the human-maintained file lists and directory # components. Yes, with minor differences, this is sheer duplication # of the staging rules above using $(INSTALL_DATA) instead of LN_S and -# `$(INSTALL) -d' instead of `mkdir -p'. In particular, +# `$(mkinstalldirs)' instead of `mkdir -p'. In particular, # extra_target_headers are taken out of the build tree staging area; # the rest are taken from the original source tree. gxx_include_dir = @gxx_include_dir@ install-data-local: - $(INSTALL) -d ${gxx_include_dir} - $(INSTALL) -d ${gxx_include_dir}/${bits_builddir} + $(mkinstalldirs) ${gxx_include_dir} + $(mkinstalldirs) ${gxx_include_dir}/${bits_builddir} for file in ${bits_headers}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done - $(INSTALL) -d ${gxx_include_dir}/${backward_builddir} + $(mkinstalldirs) ${gxx_include_dir}/${backward_builddir} for file in ${backward_headers}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${backward_builddir}; done - $(INSTALL) -d ${gxx_include_dir}/${ext_builddir} + $(mkinstalldirs) ${gxx_include_dir}/${ext_builddir} for file in ${ext_headers}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done - $(INSTALL) -d ${gxx_include_dir}/${c_base_builddir} + $(mkinstalldirs) ${gxx_include_dir}/${c_base_builddir} for file in ${c_base_headers_rename}; do \ $(INSTALL_DATA) ${c_base_builddir}/$${file} \ ${gxx_include_dir}/${c_base_builddir}; done c_base_headers_extra_install=${c_base_headers_extra};\ for file in $$c_base_headers_extra_install; do \ $(INSTALL_DATA) $$file ${gxx_include_dir}/${bits_builddir}; done - $(INSTALL) -d ${gxx_include_dir}/${std_builddir} + $(mkinstalldirs) ${gxx_include_dir}/${std_builddir} for file in ${std_headers_rename}; do \ $(INSTALL_DATA) ${std_builddir}/$${file} \ ${gxx_include_dir}/${std_builddir}; done - $(INSTALL) -d ${gxx_include_dir}/${target_builddir} + $(mkinstalldirs) ${gxx_include_dir}/${target_builddir} for file in ${target_headers} ${extra_target_headers} \ ${thread_target_headers}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index cd7d4105b2c5..9068ee8d5b7b 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -442,7 +442,7 @@ uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_] # tree using only the human-maintained file lists and directory # components. Yes, with minor differences, this is sheer duplication # of the staging rules above using $(INSTALL_DATA) instead of LN_S and -# `$(INSTALL) -d' instead of `mkdir -p'. In particular, +# `$(mkinstalldirs)' instead of `mkdir -p'. In particular, # extra_target_headers are taken out of the build tree staging area; # the rest are taken from the original source tree. gxx_include_dir = @gxx_include_dir@ @@ -458,9 +458,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --cygnus include/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnits include/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -473,8 +473,13 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = include distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits include/Makefile @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + d=$(srcdir); \ if test -d $$d/$$file; then \ cp -pr $$d/$$file $(distdir)/$$file; \ else \ @@ -487,12 +492,10 @@ info-am: info: info-am dvi-am: dvi: dvi-am -check-am: +check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am -install-info-am: -install-info: install-info-am install-exec-am: install-exec: install-exec-am @@ -540,12 +543,11 @@ maintainer-clean-am: maintainer-clean-generic distclean-am maintainer-clean: maintainer-clean-am .PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-info-am install-info \ -install-exec-am install-exec install-data-local install-data-am \ -install-data install-am install uninstall-am uninstall all-local \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +installcheck-am installcheck install-exec-am install-exec \ +install-data-local install-data-am install-data install-am install \ +uninstall-am uninstall all-local all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Here are the rules for building the headers @@ -654,28 +656,28 @@ ${target_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcpp_thread_h} \ -e 's,^#include "\(.*\)",#include ,g' \ < ${toplevel_srcdir}/gcc/${glibcpp_thread_h} > $@ install-data-local: - $(INSTALL) -d ${gxx_include_dir} - $(INSTALL) -d ${gxx_include_dir}/${bits_builddir} + $(mkinstalldirs) ${gxx_include_dir} + $(mkinstalldirs) ${gxx_include_dir}/${bits_builddir} for file in ${bits_headers}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done - $(INSTALL) -d ${gxx_include_dir}/${backward_builddir} + $(mkinstalldirs) ${gxx_include_dir}/${backward_builddir} for file in ${backward_headers}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${backward_builddir}; done - $(INSTALL) -d ${gxx_include_dir}/${ext_builddir} + $(mkinstalldirs) ${gxx_include_dir}/${ext_builddir} for file in ${ext_headers}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done - $(INSTALL) -d ${gxx_include_dir}/${c_base_builddir} + $(mkinstalldirs) ${gxx_include_dir}/${c_base_builddir} for file in ${c_base_headers_rename}; do \ $(INSTALL_DATA) ${c_base_builddir}/$${file} \ ${gxx_include_dir}/${c_base_builddir}; done c_base_headers_extra_install=${c_base_headers_extra};\ for file in $$c_base_headers_extra_install; do \ $(INSTALL_DATA) $$file ${gxx_include_dir}/${bits_builddir}; done - $(INSTALL) -d ${gxx_include_dir}/${std_builddir} + $(mkinstalldirs) ${gxx_include_dir}/${std_builddir} for file in ${std_headers_rename}; do \ $(INSTALL_DATA) ${std_builddir}/$${file} \ ${gxx_include_dir}/${std_builddir}; done - $(INSTALL) -d ${gxx_include_dir}/${target_builddir} + $(mkinstalldirs) ${gxx_include_dir}/${target_builddir} for file in ${target_headers} ${extra_target_headers} \ ${thread_target_headers}; do \ $(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done