OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libgcj/64219 (Rename libgcj-5.0.pc to libgcj-5.pc)

Browse Source 
PR libgcj/64219
	* Makefile.am (install-data-local): Use just the major version
	from GCJVERSION instead of major.minor.
	* Makefile.in: Regenerated.

From-SVN: r219519
This commit is contained in:
Jakub Jelinek 2015-01-13 09:23:31 +01:00 committed by Jakub Jelinek
parent 4855be8434
commit 0d7a9dbdd2
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -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

2
libjava/Makefile.am
View File

@ -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"; \

2
libjava/Makefile.in
View File

@ -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"; \