Patch: FYI: rename installed libgcj.pc file

Tom Tromey tromey@redhat.com
Tue Oct 10 18:43:00 GMT 2006


I'm checking this in on the trunk.

This fixes PR 29205 by renaming the installed libgcj.pc file.  The new
file name includes the major and minor (but not release) version
number.  I believe that due to the way pkg-config works, this change
won't affect existing scripts.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	PR libgcj/29205:
	* Makefile.in: Rebuilt.
	* Makefile.am (install-data-local): Install the .pc file.
	(pkgconfig_DATA): Removed.

Index: Makefile.am
===================================================================
--- Makefile.am	(revision 117605)
+++ Makefile.am	(working copy)
@@ -47,7 +47,6 @@
 dbexec_LTLIBRARIES = libjvm.la
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgcj.pc
 
 jardir = $(datadir)/java
 jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
@@ -547,6 +546,11 @@
 ## hand.
 install-data-local:
 	$(PRE_INSTALL)
+## Install the .pc file.
+	@pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
+	file="libgcj-$${pc_version}.pc"; \
+	echo "  $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
+	$(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file
 ## We use a GNU make trick here so that we don't go over the command
 ## length limit of some shells.
 	@echo Creating list of headers to install...



More information about the Java-patches mailing list