aboutsummaryrefslogtreecommitdiff
path: root/libobjc
diff options
context:
space:
mode:
authoraj <aj@138bc75d-0d04-0410-961f-82ee72b054a4>2003-01-09 08:08:30 +0000
committeraj <aj@138bc75d-0d04-0410-961f-82ee72b054a4>2003-01-09 08:08:30 +0000
commit71aad3b8e13b0892e680eefa225e54b97c34e7b8 (patch)
tree7106bfd4173b8293f489f60e551c7adf31bf9590 /libobjc
parentdf2f867dfe49c49d952e473ff1eba3b3bb3021c7 (diff)
libf2c:
2003-01-09 Christian Cornelssen <ccorn@cs.tu-berlin.de> * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR. (install, uninstall): Prepend $(DESTDIR) to destination paths in all (un)installation commands. libiberty: 2003-01-09 Christian Cornelssen <ccorn@cs.tu-berlin.de> * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR. libobjc: 2003-01-09 Christian Cornelssen <ccorn@cs.tu-berlin.de> * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR. (install-libs, install-headers): Prepend $(DESTDIR) to destination paths in all (un)installation commands. libstdc++: 2003-01-09 Christian Cornelssen <ccorn@cs.tu-berlin.de> * include/Makefile.am (install-data-local): Prepend $(DESTDIR) to destination paths in all (un)installation commands. Use ${c_base_builddir} and ${std_builddir} as destination subdirectories to achieve consistency with preceding mkinstalldirs commands. No effect because both variables contain "." only. * include/Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61082 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc')
-rw-r--r--libobjc/ChangeLog6
-rw-r--r--libobjc/Makefile.in13
2 files changed, 13 insertions, 6 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 7b8247de658..cddc338d1ea 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-09 Christian Cornelssen <ccorn@cs.tu-berlin.de>
+
+ * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR.
+ (install-libs, install-headers): Prepend $(DESTDIR) to
+ destination paths in all (un)installation commands.
+
2002-12-02 Zack Weinberg <zack@codesourcery.com>
* thr-objc.c: Include coretypes.h and tm.h.
diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index 4d5c5da8db4..244f1e75a1a 100644
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -118,6 +118,7 @@ FLAGS_TO_PASS = \
"AR_FLAGS=$(AR_FLAGS)" \
"CC=$(CC)" \
"CFLAGS=$(CFLAGS)" \
+ "DESTDIR=$(DESTDIR)" \
"LIBCFLAGS=$(LIBCFLAGS)" \
"EXTRA_OFILES=$(EXTRA_OFILES)" \
"HDEFINES=$(HDEFINES)" \
@@ -318,21 +319,21 @@ ${srcdir}/configure: configure.in
install: install-libs install-headers
install-libs: installdirs
- $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(glibcpp_toolexeclibdir)
- $(LIBTOOL_INSTALL) $(INSTALL) libobjc.la $(glibcpp_toolexeclibdir);
+ $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(glibcpp_toolexeclibdir)
+ $(LIBTOOL_INSTALL) $(INSTALL) libobjc.la $(DESTDIR)$(glibcpp_toolexeclibdir);
if [ "$(OBJC_BOEHM_GC)" ]; then \
$(LIBTOOL_INSTALL) $(INSTALL) libobjc_gc.la \
- $(glibcpp_toolexeclibdir);\
+ $(DESTDIR)$(glibcpp_toolexeclibdir);\
fi
$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@"
- @-$(LIBTOOL) --mode=finish $(glibcpp_toolexeclibdir)
+ @-$(LIBTOOL) --mode=finish $(DESTDIR)$(glibcpp_toolexeclibdir)
# Copy Objective C headers to installation include directory.
install-headers:
- $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(libsubdir)/include/objc
+ $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(libsubdir)/include/objc
for file in $(OBJC_H); do \
realfile=$(srcdir)/objc/$${file}; \
- $(INSTALL_DATA) $${realfile} $(libsubdir)/include/objc; \
+ $(INSTALL_DATA) $${realfile} $(DESTDIR)$(libsubdir)/include/objc; \
done
check uninstall install-strip dist installcheck installdirs: