aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2009-06-22 15:20:34 +0000
committerMatthias Klose <doko@gcc.gnu.org>2009-06-22 15:20:34 +0000
commit86e3c83a1cc35d293f60ebd6128993b754a9e7ad (patch)
treeb7dc246de46d3fd040963eabf3e32067a8421c48 /gcc
parent0a7d7dea564b2f054f5fa7314302b5cb7224ebbb (diff)
downloadgcc-86e3c83a1cc35d293f60ebd6128993b754a9e7ad.zip
gcc-86e3c83a1cc35d293f60ebd6128993b754a9e7ad.tar.gz
gcc-86e3c83a1cc35d293f60ebd6128993b754a9e7ad.tar.bz2
Makefile.in (install-plugin): Remove extra `/' after $(DESTDIR).
2009-06-22 Matthias Klose <doko@ubuntu.com> * Makefile.in (install-plugin): Remove extra `/' after $(DESTDIR). From-SVN: r148806
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/Makefile.in6
2 files changed, 7 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2df85f6..d16cd5f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-22 Matthias Klose <doko@ubuntu.com>
+
+ * Makefile.in (install-plugin): Remove extra `/' after $(DESTDIR).
+
2009-06-22 Steven Bosscher <steven@gcc.gnu.org>
PR objc/28050
@@ -101,7 +105,6 @@
* var-tracking.c: Ditto.
* vmsdbgout.c: Ditto.
->>>>>>> .r148803
2009-06-22 Matthias Klose <doko@ubuntu.com>
* Makefile.in (install-plugin): Always use DESTDIR.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 826b080..1cee44e 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -4064,10 +4064,10 @@ install-plugin: installdirs
*) base=`basename $$path` ;; \
esac; \
dest=$(plugin_includedir)/$$base; \
- echo $(INSTALL_DATA) $$path $(DESTDIR)/$$dest; \
+ echo $(INSTALL_DATA) $$path $(DESTDIR)$$dest; \
dir=`dirname $$dest`; \
- $(mkinstalldirs) $(DESTDIR)/$$dir; \
- $(INSTALL_DATA) $$path $(DESTDIR)/$$dest; \
+ $(mkinstalldirs) $(DESTDIR)$$dir; \
+ $(INSTALL_DATA) $$path $(DESTDIR)$$dest; \
done
# Install the compiler executables built during cross compilation.