PR libgcj/64219

	* Makefile.am (install-data-local): Use just the major version
	from GCJVERSION instead of major.minor.
	* Makefile.in: Regenerated.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219519 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f77de2a..d616dcb 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-13  Jakub Jelinek  <jakub@redhat.com>
+
+       PR libgcj/64219
+       * Makefile.am (install-data-local): Use just the major version
+       from GCJVERSION instead of major.minor.
+       * Makefile.in: Regenerated.
+
 2015-01-05  Jakub Jelinek  <jakub@redhat.com>
 
        * classpath/gnu/java/rmi/registry/RegistryImpl.java (version): Update

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 39b5199..96a0815 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -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"; \

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index f0f6350..6b21488 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -12455,7 +12455,7 @@ install-exec-hook: install-binPROGRAMS install-toolexeclibLTLIBRARIES \
 @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"; \