Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR.

* Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR.
(install-libs, install-headers): Prepend $(DESTDIR) to
destination paths in all (un)installation commands.

From-SVN: r62011

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 32c2cdd864e7435cca2fc40022a49da5ce56e72e..e1e043ed3d573334024e130bd0d746c14dd6a5e5 100644 (file)
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-28  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.
+
 2003-01-27  Alexandre Oliva  <aoliva@redhat.com>
 
        * aclocal.m4 (glibcpp_toolexeclibdir): Instead of

diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index 45f8e2584d2da0c75716020856af33cfbc777b96..28361d26bb8f76060c7dd60f5680cb7cccc1f543 100644 (file)
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -117,6 +117,7 @@ FLAGS_TO_PASS = \
        "AR_FLAGS=$(AR_FLAGS)" \
        "CC=$(CC)" \
        "CFLAGS=$(CFLAGS)" \
+       "DESTDIR=$(DESTDIR)" \
        "LIBCFLAGS=$(LIBCFLAGS)" \
        "EXTRA_OFILES=$(EXTRA_OFILES)" \
        "HDEFINES=$(HDEFINES)" \
@@ -317,21 +318,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: