On January 12, 2015 9:04:50 PM CET, Jakub Jelinek <ja...@redhat.com> wrote:
>Hi!
>
>This patch changes the libgcj*.pc installed filename to match the new
>GCC
>versioning scheme.
>
>Bootstrapped/regtested on x86_64-linux and i686-linux, tested make
>install.
>
>-rw-r--r--. 1 jakub jakub 192 Jan 12 21:02
>/tmp/blah/usr/local/lib64/pkgconfig/libgcj-5.pc
>-rw-r--r--. 1 jakub jakub 192 Jan 12 21:02
>/tmp/blah/usr/local/lib/pkgconfig/libgcj-5.pc
>
>Ok for trunk?
OK.
Thanks,
Richard.
>2015-01-12 Jakub Jelinek <ja...@redhat.com>
>
> PR libgcj/64219
> * Makefile.am (install-data-local): Use just the major version
> from GCJVERSION instead of major.minor.
> * Makefile.in: Regenerated.
>
>--- libjava/Makefile.am.jj 2014-02-20 21:38:45.000000000 +0100
>+++ libjava/Makefile.am 2015-01-12 12:40:50.453179067 +0100
>@@ -779,7 +779,7 @@ install_data_local_split = 50
> install-data-local:
> $(PRE_INSTALL)
> ## Install the .pc file.
>- @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
>+ @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*[.][^.]*$$//'`; \
> file="libgcj-$${pc_version}.pc"; \
> $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
> echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
>--- libjava/Makefile.in.jj 2014-02-20 21:38:45.000000000 +0100
>+++ libjava/Makefile.in 2015-01-12 12:41:09.376849424 +0100
>@@ -12455,7 +12455,7 @@ install-exec-hook: install-binPROGRAMS i
>@BUILD_ECJ1_TRUE@ mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed
>'s,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
>$(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
> install-data-local:
> $(PRE_INSTALL)
>- @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
>+ @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*[.][^.]*$$//'`; \
> file="libgcj-$${pc_version}.pc"; \
> $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
> echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
>
> Jakub
