This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [patch] add missing DESTDIR in install-plugin target
Ralf Wildenhues schrieb:
> Hello Matthias,
>
> * Matthias Klose wrote on Mon, Jun 22, 2009 at 11:21:24AM CEST:
>> Add a missing DESTDIR in install-plugin target, committed as obvious.
>
> And is pretty obviously broken. $(DESTDIR) must not be separated from
> the following directory with a slash, as it is usually empty, and the
> slash will break --prefix=C:/foo on w32.
>
> Cheers,
> Ralf
>
>> 2009-06-22 Matthias Klose <doko@ubuntu.com>
>>
>> * Makefile.in (install-plugin): Always use DESTDIR.
>
>> --- gcc/Makefile.in (revision 148750)
>> +++ gcc/Makefile.in (working copy)
>> @@ -4066,7 +4066,7 @@
>> dest=$(plugin_includedir)/$$base; \
>> echo $(INSTALL_DATA) $$path $(DESTDIR)/$$dest; \
>> dir=`dirname $$dest`; \
>> - $(mkinstalldirs) $$dir; \
>> + $(mkinstalldirs) $(DESTDIR)/$$dir; \
>> $(INSTALL_DATA) $$path $(DESTDIR)/$$dest; \
ok, not more broken than before. removing the extra slash in every location.
test installation succeeds. ok for the trunk?
Index: gcc/Makefile.in
===================================================================
--- gcc/Makefile.in (revision 148783)
+++ gcc/Makefile.in (working copy)
@@ -4064,10 +4064,10 @@
*) 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.