diff options
| author | Christian Cornelssen <ccorn@cs.tu-berlin.de> | 2003-01-28 22:51:46 +0100 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@gcc.gnu.org> | 2003-01-28 21:51:46 +0000 |
| commit | c763a321d62276b9671278a107b8851032cf0a47 (patch) | |
| tree | 9ccab83f98d30b8003809eb92689449f4c133782 /libiberty | |
| parent | 5cafc8224f8fc01394c0552b85ace285582fb17c (diff) | |
| download | gcc-c763a321d62276b9671278a107b8851032cf0a47.zip gcc-c763a321d62276b9671278a107b8851032cf0a47.tar.gz gcc-c763a321d62276b9671278a107b8851032cf0a47.tar.bz2 | |
Makefile.in (mkinstalldirs): New variable.
* Makefile.in (mkinstalldirs): New variable.
(FLAGS_TO_PASS): Also pass DESTDIR.
(install_to_libdir, install_to_tooldir): Add $(mkinstalldirs)
command. Prepend $(DESTDIR) to destination paths.
Cd to destination directory for post-install work.
From-SVN: r62012
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 8 | ||||
| -rw-r--r-- | libiberty/Makefile.in | 18 |
2 files changed, 20 insertions, 6 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 411ec23..7accc68 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,11 @@ +2003-01-28 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * Makefile.in (mkinstalldirs): New variable. + (FLAGS_TO_PASS): Also pass DESTDIR. + (install_to_libdir, install_to_tooldir): Add $(mkinstalldirs) + command. Prepend $(DESTDIR) to destination paths. + Cd to destination directory for post-install work. + 2003-01-27 Alexandre Oliva <aoliva@redhat.com> * Makefile.in (install_to_tooldir): Instead of $(MULTISUBDIR), use diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index 4efc16a..c4248b0 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -48,6 +48,7 @@ MULTICLEAN = true INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +mkinstalldirs = $(SHELL) $(srcdir)/../mkinstalldirs AR = @AR@ AR_FLAGS = rc @@ -78,6 +79,7 @@ FLAGS_TO_PASS = \ "AR_FLAGS=$(AR_FLAGS)" \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ + "DESTDIR=$(DESTDIR)" \ "LIBCFLAGS=$(LIBCFLAGS)" \ "EXTRA_OFILES=$(EXTRA_OFILES)" \ "HDEFINES=$(HDEFINES)" \ @@ -237,15 +239,19 @@ INSTALL_DEST = @INSTALL_DEST@ install: install_to_$(INSTALL_DEST) install-subdir install_to_libdir: all - $(INSTALL_DATA) $(TARGETLIB) $(libdir)$(MULTISUBDIR)/$(TARGETLIB)n - ( cd $(libdir)$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n ) - mv -f $(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(libdir)$(MULTISUBDIR)/$(TARGETLIB) + $(mkinstalldirs) $(DESTDIR)$(libdir)$(MULTISUBDIR) + $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n + ( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) && \ + $(RANLIB) $(TARGETLIB)n && \ + mv -f $(TARGETLIB)n $(TARGETLIB) ) @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install install_to_tooldir: all - $(INSTALL_DATA) $(TARGETLIB) $(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB)n - ( cd $(tooldir)/lib/`$$CC -print-multi-os-directory` ; $(RANLIB) $(TARGETLIB)n ) - mv -f $(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB)n $(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB) + $(mkinstalldirs) $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory` + $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB)n + ( cd $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory` && \ + $(RANLIB) $(TARGETLIB)n && \ + mv -f $(TARGETLIB)n $(TARGETLIB) ) @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install # needed-list is used by libstdc++. NEEDED is the list of functions |