Skip to content

R
riscv-gcc-1
Commit 51d0a5cc by Tom Tromey Committed by Tom Tromey
Options

re PR libgcj/29205 (lib/pkgconfig/libgcj.pc needs to become version dependent) 

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

From-SVN: r117610
parent 21825fd6
Showing with 33 additions and 40 deletions
libjava/ChangeLog
2006-10-10 Tom Tromey <tromey@redhat.com>
PR libgcj/29205:
* Makefile.in: Rebuilt.
* Makefile.am (install-data-local): Install the .pc file.
(pkgconfig_DATA): Removed.
2006-10-03 Gary Benson <gbenson@redhat.com> 2006-10-03 Gary Benson <gbenson@redhat.com>
* java/net/InetAddress.java * java/net/InetAddress.java
......
libjava/Makefile.am
...@@ -47,7 +47,6 @@ endif ...@@ -47,7 +47,6 @@ endif
dbexec_LTLIBRARIES = libjvm.la dbexec_LTLIBRARIES = libjvm.la
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgcj.pc
jardir = $(datadir)/java jardir = $(datadir)/java
jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
...@@ -547,6 +546,11 @@ endif ...@@ -547,6 +546,11 @@ endif
## hand. ## hand.
install-data-local: install-data-local:
$(PRE_INSTALL) $(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 ## We use a GNU make trick here so that we don't go over the command
## length limit of some shells. ## length limit of some shells.
@echo Creating list of headers to install... @echo Creating list of headers to install...
......
libjava/Makefile.in
...@@ -111,8 +111,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ...@@ -111,8 +111,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(dbexecdir)" \ am__installdirs = "$(DESTDIR)$(dbexecdir)" \
"$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbexecdir)" \ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbexecdir)" \
"$(DESTDIR)$(jardir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(jardir)" "$(DESTDIR)$(toolexecmainlibdir)"
"$(DESTDIR)$(toolexecmainlibdir)"
dbexecLTLIBRARIES_INSTALL = $(INSTALL) dbexecLTLIBRARIES_INSTALL = $(INSTALL)
toolexeclibLTLIBRARIES_INSTALL = $(INSTALL) toolexeclibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(dbexec_LTLIBRARIES) $(toolexeclib_LTLIBRARIES) LTLIBRARIES = $(dbexec_LTLIBRARIES) $(toolexeclib_LTLIBRARIES)
...@@ -450,10 +449,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ...@@ -450,10 +449,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
uninstall-recursive uninstall-recursive
dbexecDATA_INSTALL = $(INSTALL_DATA) dbexecDATA_INSTALL = $(INSTALL_DATA)
jarDATA_INSTALL = $(INSTALL_DATA) jarDATA_INSTALL = $(INSTALL_DATA)
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
toolexecmainlibDATA_INSTALL = $(INSTALL_DATA) toolexecmainlibDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dbexec_DATA) $(jar_DATA) $(pkgconfig_DATA) \ DATA = $(dbexec_DATA) $(jar_DATA) $(toolexecmainlib_DATA)
$(toolexecmainlib_DATA)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
DIST_SUBDIRS = @DIRLTDL@ gcj include classpath testsuite DIST_SUBDIRS = @DIRLTDL@ gcj include classpath testsuite
...@@ -716,7 +713,6 @@ toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la \ ...@@ -716,7 +713,6 @@ toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la \
toolexecmainlib_DATA = libgcj.spec toolexecmainlib_DATA = libgcj.spec
dbexec_LTLIBRARIES = libjvm.la dbexec_LTLIBRARIES = libjvm.la
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgcj.pc
jardir = $(datadir)/java jardir = $(datadir)/java
jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
@JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix) @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
...@@ -8700,23 +8696,6 @@ uninstall-jarDATA: ...@@ -8700,23 +8696,6 @@ uninstall-jarDATA:
echo " rm -f '$(DESTDIR)$(jardir)/$$f'"; \ echo " rm -f '$(DESTDIR)$(jardir)/$$f'"; \
rm -f "$(DESTDIR)$(jardir)/$$f"; \ rm -f "$(DESTDIR)$(jardir)/$$f"; \
done done
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
@list='$(pkgconfig_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
$(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
done
uninstall-pkgconfigDATA:
@$(NORMAL_UNINSTALL)
@list='$(pkgconfig_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
done
install-toolexecmainlibDATA: $(toolexecmainlib_DATA) install-toolexecmainlibDATA: $(toolexecmainlib_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(toolexecmainlibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexecmainlibdir)" test -z "$(toolexecmainlibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexecmainlibdir)"
...@@ -9014,7 +8993,7 @@ check: check-recursive ...@@ -9014,7 +8993,7 @@ check: check-recursive
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA)
installdirs: installdirs-recursive installdirs: installdirs-recursive
installdirs-am: installdirs-am:
for dir in "$(DESTDIR)$(dbexecdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbexecdir)" "$(DESTDIR)$(jardir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(toolexecmainlibdir)"; do \ for dir in "$(DESTDIR)$(dbexecdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbexecdir)" "$(DESTDIR)$(jardir)" "$(DESTDIR)$(toolexecmainlibdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done done
install: install-recursive install: install-recursive
...@@ -9121,8 +9100,7 @@ info: info-recursive ...@@ -9121,8 +9100,7 @@ info: info-recursive
info-am: info-am:
install-data-am: install-data-local install-jarDATA \ install-data-am: install-data-local install-jarDATA
install-pkgconfigDATA
install-exec-am: install-binPROGRAMS install-binSCRIPTS \ install-exec-am: install-binPROGRAMS install-binSCRIPTS \
install-dbexecDATA install-dbexecLTLIBRARIES \ install-dbexecDATA install-dbexecLTLIBRARIES \
...@@ -9158,7 +9136,7 @@ ps-am: ...@@ -9158,7 +9136,7 @@ ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-dbexecDATA uninstall-dbexecLTLIBRARIES \ uninstall-dbexecDATA uninstall-dbexecLTLIBRARIES \
uninstall-info-am uninstall-jarDATA uninstall-pkgconfigDATA \ uninstall-info-am uninstall-jarDATA \
uninstall-toolexeclibLTLIBRARIES uninstall-toolexecmainlibDATA uninstall-toolexeclibLTLIBRARIES uninstall-toolexecmainlibDATA
uninstall-info: uninstall-info-recursive uninstall-info: uninstall-info-recursive
...@@ -9176,18 +9154,18 @@ uninstall-info: uninstall-info-recursive ...@@ -9176,18 +9154,18 @@ uninstall-info: uninstall-info-recursive
install-data install-data-am install-data-local \ install-data install-data-am install-data-local \
install-dbexecDATA install-dbexecLTLIBRARIES install-exec \ install-dbexecDATA install-dbexecLTLIBRARIES install-exec \
install-exec-am install-exec-hook install-info install-info-am \ install-exec-am install-exec-hook install-info install-info-am \
install-jarDATA install-man install-pkgconfigDATA \ install-jarDATA install-man install-strip \
install-strip install-toolexeclibLTLIBRARIES \ install-toolexeclibLTLIBRARIES install-toolexecmainlibDATA \
install-toolexecmainlibDATA installcheck installcheck-am \ installcheck installcheck-am installdirs installdirs-am \
installdirs installdirs-am maintainer-clean \ maintainer-clean maintainer-clean-generic \
maintainer-clean-generic maintainer-clean-recursive \ maintainer-clean-recursive mostlyclean mostlyclean-compile \
mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-generic mostlyclean-libtool mostlyclean-local \
mostlyclean-libtool mostlyclean-local mostlyclean-recursive \ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-binSCRIPTS uninstall-dbexecDATA \
uninstall-dbexecDATA uninstall-dbexecLTLIBRARIES \ uninstall-dbexecLTLIBRARIES uninstall-info-am \
uninstall-info-am uninstall-jarDATA uninstall-pkgconfigDATA \ uninstall-jarDATA uninstall-toolexeclibLTLIBRARIES \
uninstall-toolexeclibLTLIBRARIES uninstall-toolexecmainlibDATA uninstall-toolexecmainlibDATA
$(db_name): gcj-dbtool$(EXEEXT) $(db_name): gcj-dbtool$(EXEEXT)
...@@ -11782,6 +11760,10 @@ $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h: ...@@ -11782,6 +11760,10 @@ $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h:
install-data-local: install-data-local:
$(PRE_INSTALL) $(PRE_INSTALL)
@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
@echo Creating list of headers to install... @echo Creating list of headers to install...
@: $(call write_entries_to_file,$(nat_headers_install) $(extra_headers),tmp-ilist) @: $(call write_entries_to_file,$(nat_headers_install) $(extra_headers),tmp-ilist)
@cat tmp-ilist | while read f; do \ @cat tmp-ilist | while read f; do \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment