diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2df85f60b9a..d16cd5f44ca 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2009-06-22 Matthias Klose + + * Makefile.in (install-plugin): Remove extra `/' after $(DESTDIR). + 2009-06-22 Steven Bosscher PR objc/28050 @@ -101,7 +105,6 @@ * var-tracking.c: Ditto. * vmsdbgout.c: Ditto. ->>>>>>> .r148803 2009-06-22 Matthias Klose * Makefile.in (install-plugin): Always use DESTDIR. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 826b080211b..1cee44ec709 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.