diff options
| author | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-10-15 07:42:57 +0000 |
|---|---|---|
| committer | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-10-15 07:42:57 +0000 |
| commit | ff4344250921a499b827eae88e7353069da0420b (patch) | |
| tree | cf043af69064a496112900739079348012647f35 /libobjc/Makefile.in | |
| parent | a5f53fac013f1cb7652a430fc5aacd950956399b (diff) | |
| download | gcc-ff4344250921a499b827eae88e7353069da0420b.tar.gz | |
Index: config/ChangeLog
2006-10-14 Geoffrey Keating <geoffk@apple.com>
* multi.m4: New file, from automake version 2 branch.
Index: libgomp/ChangeLog
2006-10-14 Geoffrey Keating <geoffk@apple.com>
* aclocal.m4: Regenerate.
* configure: Regenerate.
Index: libstdc++-v3/ChangeLog
2006-10-14 Geoffrey Keating <geoffk@apple.com>
* aclocal.m4: Regenerate.
* configure: Regenerate with released autoconf-2.59.
Index: libobjc/ChangeLog
2006-10-14 Geoffrey Keating <geoffk@apple.com>
* Makefile.in: Use multi_basedir instead of toplevel_srcdir.
* configure.ac: Use multi.m4 from aclocal rather than custom
code. Use multi_basedir instead of toplevel_srcdir.
* aclocal.m4: Regenerate.
* configure: Regenerate.
Index: libssp/ChangeLog
2006-10-14 Geoffrey Keating <geoffk@apple.com>
* aclocal.m4: Regenerate.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117741 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc/Makefile.in')
| -rw-r--r-- | libobjc/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index 146644b1fc2..203629f4f10 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -36,7 +36,7 @@ target_noncanonical = @target_noncanonical@ gcc_version := $(shell cat $(srcdir)/../gcc/BASE-VER) host_subdir = @host_subdir@ top_srcdir = @top_srcdir@ -toplevel_srcdir = @toplevel_srcdir@ +multi_basedir = @multi_basedir@ toolexecdir = @toolexecdir@ # Toolexecdir is used only by toolexeclibdir toolexeclibdir = @toolexeclibdir@ @@ -332,7 +332,7 @@ ${srcdir}/configure: @MAINT@ configure.ac install: install-libs install-headers install-libs: installdirs - $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(toolexeclibdir) + $(SHELL) $(multi_basedir)/mkinstalldirs $(DESTDIR)$(toolexeclibdir) $(LIBTOOL_INSTALL) $(INSTALL) libobjc$(libext).la $(DESTDIR)$(toolexeclibdir); if [ "$(OBJC_BOEHM_GC)" ]; then \ $(LIBTOOL_INSTALL) $(INSTALL) libobjc_gc$(libext).la \ @@ -343,7 +343,7 @@ install-libs: installdirs # Copy Objective C headers to installation include directory. install-headers: - $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(libsubdir)/$(includedirname)/objc + $(SHELL) $(multi_basedir)/mkinstalldirs $(DESTDIR)$(libsubdir)/$(includedirname)/objc for file in $(OBJC_H); do \ realfile=$(srcdir)/objc/$${file}; \ $(INSTALL_DATA) $${realfile} $(DESTDIR)$(libsubdir)/$(includedirname)/objc; \ |