diff options
| author | sirl <sirl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-11 18:10:05 +0000 |
|---|---|---|
| committer | sirl <sirl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-11 18:10:05 +0000 |
| commit | 6ed576566558a5244ee361570888f41003d7e76f (patch) | |
| tree | ba208a5ccf922ea2180b4d9334a96cfaf835ad60 /libobjc/Makefile.in | |
| parent | 690d3235eaafd764c6119c13a46732a759196af8 (diff) | |
| download | gcc-6ed576566558a5244ee361570888f41003d7e76f.tar.gz | |
2002-02-11 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
PR libobjc/4039
* aclocal.m4: Replace with version copied from libstdc++-v3.
* configure.in: Update for changes to aclocal and Makefile.
* configure: Regenerate.
* Makefile.in: Correct install of multilibs and shared libs, use
INSTALL_DATA for include files.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49680 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc/Makefile.in')
| -rw-r--r-- | libobjc/Makefile.in | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index aed5f11d500..2faf269f101 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -23,20 +23,27 @@ #worthless. SHELL = /bin/sh +MAKEOVERRIDES= #### Start of system configuration section. #### -srcdir = @srcdir@ -VPATH = @srcdir@ +srcdir = @glibcpp_srcdir@ +VPATH = @glibcpp_srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ target_alias = @target_alias@ gcc_version = @gcc_version@ gcc_version_trigger = @gcc_version_trigger@ +top_srcdir = @top_srcdir@ +toplevel_srcdir = @toplevel_srcdir@ +toolexecdir = @glibcpp_toolexecdir@ +glibcpp_toolexecdir = @glibcpp_toolexecdir@ +glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@ + +top_builddir = . libdir = $(exec_prefix)/lib libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version) -incinstalldir = $(libsubdir)/include # Multilib support variables. MULTISRCTOP = @@ -253,11 +260,13 @@ $(OBJC_THREAD_FILE)_gc.lo: $(OBJC_THREAD_FILE).c doc: info dvi html libobjc.la: $(OBJS) - $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) -rpath $(libsubdir) \ + $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \ + -rpath $(glibcpp_toolexeclibdir) \ -version-info $(LIBOBJC_VERSION) libobjc_gc.la: $(OBJS_GC) - $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) -rpath $(libsubdir) \ + $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \ + -rpath $(glibcpp_toolexeclibdir) \ -version-info $(LIBOBJC_GC_VERSION) # @@ -305,24 +314,24 @@ ${srcdir}/configure: configure.in rm -f config.cache cd ${srcdir} && autoconf -install: install-libs copy-headers +install: install-libs install-headers install-libs: installdirs - $(LIBTOOL_INSTALL) $(INSTALL_DATA) libobjc.la $(libsubdir)/libobjc.la; + $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(glibcpp_toolexeclibdir) + $(LIBTOOL_INSTALL) $(INSTALL) libobjc.la $(glibcpp_toolexeclibdir); if [ "$(OBJC_BOEHM_GC)" ]; then \ - $(LIBTOOL_INSTALL) $(INSTALL_DATA) libobjc_gc.la \ - $(libsubdir)/libobjc_gc.la;\ + $(LIBTOOL_INSTALL) $(INSTALL) libobjc_gc.la \ + $(glibcpp_toolexeclibdir);\ fi + $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@" + @-$(LIBTOOL) --mode=finish $(glibcpp_toolexeclibdir) # Copy Objective C headers to installation include directory. -copy-headers: - -rm -rf $(incinstalldir)/objc - -mkdir $(incinstalldir)/objc - -chmod a+rx $(incinstalldir)/objc +install-headers: + $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(libsubdir)/include/objc for file in $(OBJC_H); do \ realfile=$(srcdir)/objc/$${file}; \ - cp $${realfile} $(incinstalldir)/objc; \ - chmod a+r $(incinstalldir)/objc/$${file}; \ + $(INSTALL_DATA) $${realfile} $(libsubdir)/include/objc; \ done check uninstall install-strip dist installcheck installdirs: |