* Makefile.in, config/t-slibgcc-darwin, config/t-slibgcc-elf-ver,

	config/t-slibgcc-sld, config/mips/t-iris5-6, config/sh/t-linux:
	Use the top level mkinstalldirs, not the one in the gcc subdir.
	* mkinstalldirs: Remove (from the gcc subdir).

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@77466 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aa42518..ef2a3f5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-07  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+       * Makefile.in, config/t-slibgcc-darwin, config/t-slibgcc-elf-ver,
+       config/t-slibgcc-sld, config/mips/t-iris5-6, config/sh/t-linux:
+       Use the top level mkinstalldirs, not the one in the gcc subdir.
+       * mkinstalldirs: Remove (from the gcc subdir).
+
 2004-02-07  Roger Sayle  <roger@eyesopen.com>
 
        PR middle-end/13696

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 1b4edcf..e59c8f5 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -251,6 +251,9 @@ STAMP = echo timestamp >
 @SET_MAKE@
 REMAKEFLAGS=LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)"
 
+# Locate mkinstalldirs.
+mkinstalldirs=$(SHELL) $(srcdir)/../mkinstalldirs
+
 # --------
 # UNSORTED
 # --------
@@ -1162,7 +1165,7 @@ libgcc.mk: config.status Makefile mklibgcc $(LIB2ADD) $(LIB2ADD_ST) xgcc$(exeext
        SHLIB_MAPFILES='$(SHLIB_MAPFILES)' \
        SHLIB_NM_FLAGS='$(SHLIB_NM_FLAGS)' \
        MULTILIB_OSDIRNAMES='$(MULTILIB_OSDIRNAMES)' \
-       mkinstalldirs='$(SHELL) $(srcdir)/mkinstalldirs' \
+       mkinstalldirs='$(mkinstalldirs)' \
          $(SHELL) mklibgcc > tmp-libgcc.mk
        mv tmp-libgcc.mk libgcc.mk
 
@@ -2520,7 +2523,7 @@ fixinc.sh: $(FIXINCSRCDIR)/mkfixinc.sh $(FIXINCSRCDIR)/fixincl.c \
 
 .PHONY: install-gcc-tooldir
 install-gcc-tooldir:
-       $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(gcc_tooldir)
+       $(mkinstalldirs) $(DESTDIR)$(gcc_tooldir)
 
 # Build fixed copies of system files.
 stmp-fixinc: fixinc.sh gsyslimits.h
@@ -2611,7 +2614,7 @@ stmp-fixproto: fixhdr.ready fixproto stmp-int-hdrs
        else \
          : This line works around a 'make' bug in BSDI 1.1.; \
          FIXPROTO_DEFINES="$(FIXPROTO_DEFINES)"; export FIXPROTO_DEFINES; \
-         mkinstalldirs="$(SHELL) $(srcdir)/mkinstalldirs"; \
+         mkinstalldirs="$(mkinstalldirs)"; \
            export mkinstalldirs; \
          if [ -d "$(SYSTEM_HEADER_DIR)" ]; then \
            $(SHELL) ${srcdir}/fixproto include include $(SYSTEM_HEADER_DIR); \
@@ -2865,14 +2868,14 @@ install-cpp: cpp$(exeext)
 # Create the installation directories.
 # $(libdir)/gcc/include isn't currently searched by cpp.
 installdirs:
-       $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(libsubdir)
-       $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(libexecsubdir)
-       $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(bindir)
-       $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(includedir)
-       $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(infodir)
-       $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(slibdir)
-       $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(man1dir)
-       $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(man7dir)
+       $(mkinstalldirs) $(DESTDIR)$(libsubdir)
+       $(mkinstalldirs) $(DESTDIR)$(libexecsubdir)
+       $(mkinstalldirs) $(DESTDIR)$(bindir)
+       $(mkinstalldirs) $(DESTDIR)$(includedir)
+       $(mkinstalldirs) $(DESTDIR)$(infodir)
+       $(mkinstalldirs) $(DESTDIR)$(slibdir)
+       $(mkinstalldirs) $(DESTDIR)$(man1dir)
+       $(mkinstalldirs) $(DESTDIR)$(man7dir)
 
 # Install the compiler executables built during cross compilation.
 install-common: native $(EXTRA_PARTS) lang.install-common installdirs
@@ -3060,8 +3063,8 @@ itoolsdatadir = $(libsubdir)/install-tools
 install-mkheaders: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir \
     mkheaders xlimits.h
        -rm -rf $(DESTDIR)$(itoolsdir) $(DESTDIR)$(itoolsdatadir)
-       $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(itoolsdatadir)/include
-       $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(itoolsdir)
+       $(mkinstalldirs) $(DESTDIR)$(itoolsdatadir)/include
+       $(mkinstalldirs) $(DESTDIR)$(itoolsdir)
        for file in $(USER_H); do \
          realfile=`echo $$file | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
          $(INSTALL_DATA) $$file \
@@ -3077,7 +3080,7 @@ install-mkheaders: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir \
            $(DESTDIR)$(itoolsdatadir)/gsyslimits.h ; \
        else :; fi
        if [ x$(STMP_FIXPROTO) != x ] ; then \
-         $(INSTALL_SCRIPT) $(srcdir)/mkinstalldirs \
+         $(INSTALL_SCRIPT) $(mkinstalldirs) \
                $(DESTDIR)$(itoolsdir)/mkinstalldirs ; \
          $(INSTALL_SCRIPT) $(srcdir)/fixproto $(DESTDIR)$(itoolsdir)/fixproto ; \
          $(INSTALL_PROGRAM) fix-header$(build_exeext) \
@@ -3839,7 +3842,7 @@ update-po: $(CATALOGS:.gmo=.pox)
 # for each language, in case they weren't built or included
 # with the distribution.
 install-po:
-       $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)
+       $(mkinstalldirs) $(DESTDIR)$(datadir)
        cats="$(CATALOGS)"; for cat in $$cats; do \
          lang=`basename $$cat | sed 's/\.gmo$$//'`; \
          if [ -f $$cat ]; then :; \
@@ -3847,8 +3850,8 @@ install-po:
          else continue; \
          fi; \
          dir=$(localedir)/$$lang/LC_MESSAGES; \
-         echo $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$$dir; \
-         $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$$dir || exit 1; \
+         echo $(mkinstalldirs) $(DESTDIR)$$dir; \
+         $(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \
          echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
          $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
        done

diff --git a/gcc/config/mips/t-iris5-6 b/gcc/config/mips/t-iris5-6
index 4321b52..43f4519 100644 (file)
--- a/gcc/config/mips/t-iris5-6
+++ b/gcc/config/mips/t-iris5-6
@@ -20,7 +20,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
 # $(slibdir) double quoted to protect it from expansion while building
 # libgcc.mk.  We want this delayed until actual install time.
 SHLIB_INSTALL = \
-       $$(SHELL) $$(srcdir)/mkinstalldirs $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
+       $$(mkinstalldirs) $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
        $(INSTALL_DATA) $(SHLIB_NAME) \
          $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \
        rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \

diff --git a/gcc/config/sh/t-linux b/gcc/config/sh/t-linux
index be38d11..41b2355 100644 (file)
--- a/gcc/config/sh/t-linux
+++ b/gcc/config/sh/t-linux
@@ -27,7 +27,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
         echo "GROUP ( $(SHLIB_SONAME) libgcc.a )" \
        ) > $(SHLIB_SOLINK)
 SHLIB_INSTALL = \
-       $$(SHELL) $$(srcdir)/mkinstalldirs $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
+       $$(mkinstalldirs) $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
        $(INSTALL_DATA) $(SHLIB_NAME) \
          $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \
        rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \

diff --git a/gcc/config/t-slibgcc-darwin b/gcc/config/t-slibgcc-darwin
index f27fae4..34cb0d4 100644 (file)
--- a/gcc/config/t-slibgcc-darwin
+++ b/gcc/config/t-slibgcc-darwin
@@ -20,7 +20,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -dynamiclib -nodefaultlibs \
 # $(slibdir) double quoted to protect it from expansion while building
 # libgcc.mk.  We want this delayed until actual install time.
 SHLIB_INSTALL = \
-       $$(SHELL) $$(srcdir)/mkinstalldirs $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
+       $$(mkinstalldirs) $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
        $(INSTALL_DATA) $(SHLIB_NAME) \
          $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \
        rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \

diff --git a/gcc/config/t-slibgcc-elf-ver b/gcc/config/t-slibgcc-elf-ver
index a176b10..cad6268 100644 (file)
--- a/gcc/config/t-slibgcc-elf-ver
+++ b/gcc/config/t-slibgcc-elf-ver
@@ -19,7 +19,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
 # $(slibdir) double quoted to protect it from expansion while building
 # libgcc.mk.  We want this delayed until actual install time.
 SHLIB_INSTALL = \
-       $$(SHELL) $$(srcdir)/mkinstalldirs $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
+       $$(mkinstalldirs) $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
        $(INSTALL_DATA) $(SHLIB_NAME) \
          $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \
        rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \

diff --git a/gcc/config/t-slibgcc-sld b/gcc/config/t-slibgcc-sld
index 6bdd521..1b21b66 100644 (file)
--- a/gcc/config/t-slibgcc-sld
+++ b/gcc/config/t-slibgcc-sld
@@ -17,7 +17,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
 # $(slibdir) double quoted to protect it from expansion while building
 # libgcc.mk.  We want this delayed until actual install time.
 SHLIB_INSTALL = \
-       $$(SHELL) $$(srcdir)/mkinstalldirs $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
+       $$(mkinstalldirs) $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
        $(INSTALL_DATA) $(SHLIB_NAME) \
          $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \
        rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \

diff --git a/gcc/mkinstalldirs b/gcc/mkinstalldirs
deleted file mode 100644 (file)
index d2d5f21..0000000
--- a/gcc/mkinstalldirs
+++ /dev/null
@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-case $dirmode in
-  '')
-    if mkdir -p -- . 2>/dev/null; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    fi
-    ;;
-esac
-
-for file
-do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-  shift
-
-  pathcomp=
-  for d
-  do
-    pathcomp="$pathcomp$d"
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-       errstatus=$lasterr
-      else
-       if test ! -z "$dirmode"; then
-         echo "chmod $dirmode $pathcomp"
-         lasterr=""
-         chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-         if test ! -z "$lasterr"; then
-           errstatus=$lasterr
-         fi
-       fi
-      fi
-    fi
-
-    pathcomp="$pathcomp/"
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here