* mkinstalldirs: New file, copied from automake.

* Makefile.in (installdirs): Rename from install-dirs.  Use
	mkinstalldirs.  Change all users.
This commit is contained in:
Ian Lance Taylor
1997-04-15 16:26:43 +00:00
parent a0c807260c
commit ff290bafa5
3 changed files with 21 additions and 26 deletions

View File

@ -53,7 +53,7 @@ keep_these_too="${keep_these_too} .cvsignore CYGNUS autoconf
gas gawk gcc gdb gdbm gdbtest glob gprof grep grez groff guile gzip gas gawk gcc gdb gdbm gdbtest glob gprof grep grez groff guile gzip
include inet install-sh ispell include inet install-sh ispell
ld less libg++ libgcc libgloss libiberty libio librx libstdc++ ld less libg++ libgcc libgloss libiberty libio librx libstdc++
m4 make mmalloc move-if-change newlib ncurses opcodes m4 make mkinstalldirs mmalloc move-if-change newlib ncurses opcodes
pagas patch perl prms pagas patch perl prms
rcs readline sed send-pr shellutils sim tar textutils time rcs readline sed send-pr shellutils sim tar textutils time
texinfo tgas utils uudecode wdiff xiberty texinfo tgas utils uudecode wdiff xiberty

View File

@ -1,5 +1,15 @@
Tue Apr 15 12:21:07 1997 Ian Lance Taylor <ian@cygnus.com>
* mkinstalldirs: New file, copied from automake.
* Makefile.in (installdirs): Rename from install-dirs. Use
mkinstalldirs. Change all users.
Mon Apr 14 11:21:38 1997 Ian Lance Taylor <ian@cygnus.com> Mon Apr 14 11:21:38 1997 Ian Lance Taylor <ian@cygnus.com>
* install-sh: Rename from install.sh.
* Makefile.in (INSTALL): Change install.sh to install-sh.
(DEVO_SUPPORT): Likewise.
* configure: Use ${config_shell} with ${moveifchange}. From Thomas * configure: Use ${config_shell} with ${moveifchange}. From Thomas
Graichen <graichen@rzpd.de>. Graichen <graichen@rzpd.de>.

View File

@ -45,7 +45,7 @@ GDB_NLM_DEPS =
SHELL = /bin/sh SHELL = /bin/sh
INSTALL = $$s/install.sh -c INSTALL = $$s/install-sh -c
INSTALL_PROGRAM = $(INSTALL) INSTALL_PROGRAM = $(INSTALL)
INSTALL_DATA = $(INSTALL) -m 644 INSTALL_DATA = $(INSTALL) -m 644
INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)' INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
@ -162,7 +162,7 @@ REALLY_SET_LIB_PATH = \
export $(RPATH_ENVVAR); export $(RPATH_ENVVAR);
ALL = all.normal ALL = all.normal
INSTALL_TARGET = install-dirs \ INSTALL_TARGET = installdirs \
$(INSTALL_MODULES) \ $(INSTALL_MODULES) \
$(INSTALL_TARGET_MODULES) \ $(INSTALL_TARGET_MODULES) \
$(INSTALL_X11_MODULES) \ $(INSTALL_X11_MODULES) \
@ -954,7 +954,7 @@ inet-install:
# the fixed header files. # the fixed header files.
.PHONY: install-no-fixedincludes .PHONY: install-no-fixedincludes
install-no-fixedincludes: \ install-no-fixedincludes: \
install-dirs \ installdirs \
$(INSTALL_MODULES) \ $(INSTALL_MODULES) \
$(INSTALL_TARGET_MODULES) \ $(INSTALL_TARGET_MODULES) \
$(INSTALL_X11_MODULES) \ $(INSTALL_X11_MODULES) \
@ -1031,7 +1031,7 @@ $(CROSS_CHECK_MODULES):
# This rule is used to install the modules which use FLAGS_TO_PASS. # This rule is used to install the modules which use FLAGS_TO_PASS.
# To build a target install-X means to cd to X and make install. # To build a target install-X means to cd to X and make install.
.PHONY: $(INSTALL_MODULES) .PHONY: $(INSTALL_MODULES)
$(INSTALL_MODULES): install-dirs $(INSTALL_MODULES): installdirs
@dir=`echo $@ | sed -e 's/install-//'`; \ @dir=`echo $@ | sed -e 's/install-//'`; \
if [ -f ./$${dir}/Makefile ] ; then \ if [ -f ./$${dir}/Makefile ] ; then \
r=`pwd`; export r; \ r=`pwd`; export r; \
@ -1169,7 +1169,7 @@ $(CHECK_TARGET_MODULES):
# TARGET_FLAGS_TO_PASS. To build a target install-X means to cd to X # TARGET_FLAGS_TO_PASS. To build a target install-X means to cd to X
# and make install. # and make install.
.PHONY: $(INSTALL_TARGET_MODULES) .PHONY: $(INSTALL_TARGET_MODULES)
$(INSTALL_TARGET_MODULES): install-dirs $(INSTALL_TARGET_MODULES): installdirs
@dir=`echo $@ | sed -e 's/install-target-//'`; \ @dir=`echo $@ | sed -e 's/install-target-//'`; \
if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \ if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
r=`pwd`; export r; \ r=`pwd`; export r; \
@ -1276,7 +1276,7 @@ install-gcc:
# This rule is used to install the modules which use FLAGS_TO_PASS. # This rule is used to install the modules which use FLAGS_TO_PASS.
# To build a target install-X means to cd to X and make install. # To build a target install-X means to cd to X and make install.
.PHONY: install-dosrel .PHONY: install-dosrel
install-dosrel: install-dirs info install-dosrel: installdirs info
@dir=`echo $@ | sed -e 's/install-//'`; \ @dir=`echo $@ | sed -e 's/install-//'`; \
if [ -f ./$${dir}/Makefile ] ; then \ if [ -f ./$${dir}/Makefile ] ; then \
r=`pwd`; export r; \ r=`pwd`; export r; \
@ -1381,24 +1381,9 @@ install-target: $(INSTALL_TARGET_MODULES)
MAKEDIRS= \ MAKEDIRS= \
$(prefix) \ $(prefix) \
$(exec_prefix) $(exec_prefix)
.PHONY: install-dirs .PHONY: installdirs
install-dirs: installdirs: mkinstalldirs
@for i in .. $(MAKEDIRS) ; do \ $(srcdir)/mkinstalldirs $(MAKEDIRS)
if [ x$$i != x.. ]; then \
echo Making $$i... ; \
parent=`echo $$i | sed -e 's@/[^/]*$$@@' | sed -e 's@^$$@/@'`; \
if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi ; \
if [ ! -d $$i ] ; then \
if mkdir $$i ; then \
true ; \
else \
exit 1 ; \
fi ; \
else \
true ; \
fi ; \
else true; fi; \
done
dir.info: do-install-info dir.info: do-install-info
if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \ if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
@ -1435,7 +1420,7 @@ Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag)
DEVO_SUPPORT= README Makefile.in configure configure.in \ DEVO_SUPPORT= README Makefile.in configure configure.in \
config.guess config.sub config move-if-change \ config.guess config.sub config move-if-change \
mpw-README mpw-build.in mpw-config.in mpw-configure \ mpw-README mpw-build.in mpw-config.in mpw-configure \
COPYING COPYING.LIB install.sh config-ml.in symlink-tree COPYING COPYING.LIB install-sh config-ml.in symlink-tree
# Files in devo/etc used in any net release. # Files in devo/etc used in any net release.
# ChangeLog omitted because it may refer to files which are not in this # ChangeLog omitted because it may refer to files which are not in this