Properly install mkinstalldirs

Jim Blandy jimb@redhat.com
Wed Mar 23 16:26:00 GMT 2005


These days mkinstalldirs is set to "$(SHELL)
$(srcdir)/../mkinstalldirs", which isn't suitable as a filename to be
passed to install.

2005-03-21  Jim Blandy  <jimb@redhat.com>

	* Makefile.in (mkinstalldirs_script): New variable.
	(mkinstalldirs): Use it.
	(install-mkheaders): Install mkinstalldirs_script, not
	mkinstalldirs.  Use mkinstalldirs to create the itoolsdatadir
	directory.

Index: gcc/Makefile.in
===================================================================
RCS file: /cvs/cvsfiles/devo/gcc/Makefile.in,v
retrieving revision 1.972
diff -c -p -r1.972 Makefile.in
*** gcc/Makefile.in	20 Mar 2005 20:39:25 -0000	1.972
--- gcc/Makefile.in	21 Mar 2005 21:24:04 -0000
*************** STAMP = echo timestamp >
*** 289,295 ****
  REMAKEFLAGS=LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)"
  
  # Locate mkinstalldirs.
! mkinstalldirs=$(SHELL) $(srcdir)/../mkinstalldirs
  
  # --------
  # UNSORTED
--- 289,296 ----
  REMAKEFLAGS=LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)"
  
  # Locate mkinstalldirs.
! mkinstalldirs_script=$(srcdir)/../mkinstalldirs
! mkinstalldirs=$(SHELL) $(mkinstalldirs_script)
  
  # --------
  # UNSORTED
*************** install-mkheaders: stmp-int-hdrs $(STMP_
*** 3575,3581 ****
  	  $(DESTDIR)$(itoolsdatadir)/gsyslimits.h
  	$(INSTALL_DATA) macro_list $(DESTDIR)$(itoolsdatadir)/macro_list
  	if [ x$(STMP_FIXPROTO) != x ] ; then \
! 	  $(INSTALL_SCRIPT) $(mkinstalldirs) \
  		$(DESTDIR)$(itoolsdir)/mkinstalldirs ; \
  	  $(INSTALL_SCRIPT) $(srcdir)/fixproto $(DESTDIR)$(itoolsdir)/fixproto ; \
  	  $(INSTALL_PROGRAM) build/fix-header$(build_exeext) \
--- 3576,3583 ----
  	  $(DESTDIR)$(itoolsdatadir)/gsyslimits.h
  	$(INSTALL_DATA) macro_list $(DESTDIR)$(itoolsdatadir)/macro_list
  	if [ x$(STMP_FIXPROTO) != x ] ; then \
!           $(mkinstalldirs) $(DESTDIR)$(itoolsdir) ; \
! 	  $(INSTALL_SCRIPT) $(mkinstalldirs_script) \
  		$(DESTDIR)$(itoolsdir)/mkinstalldirs ; \
  	  $(INSTALL_SCRIPT) $(srcdir)/fixproto $(DESTDIR)$(itoolsdir)/fixproto ; \
  	  $(INSTALL_PROGRAM) build/fix-header$(build_exeext) \



More information about the Gcc-patches mailing list