FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libgcj/23499 (libgcj/classpath create empty directory $PREFIX/share/classpath/api/)

Browse source 
PR libgcj/23499:
	* lib/Makefile.in: Rebuilt.
	* lib/Makefile.am (glibj_DATA): Commented out.

From-SVN: r109426
This commit is contained in:
Tom Tromey 2006-01-06 20:12:22 +00:00 • committed by Tom Tromey
parent 42a27024e9
commit 782e98753b
3 changed files with 18 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libjava/classpath/ChangeLog.gcj
View file

@ -1,3 +1,9 @@
2006-01-06 Tom Tromey <tromey@redhat.com>
PR libgcj/23499:
* lib/Makefile.in: Rebuilt.
* lib/Makefile.am (glibj_DATA): Commented out.
2005-12-01 Anthony Green <green@redhat.com>
PR bootstrap/25207

4
libjava/classpath/lib/Makefile.am
View file

@ -40,7 +40,9 @@ JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB)
if INSTALL_GLIBJ_ZIP
glibj_DATA = glibj.zip
## GCJ LOCAL: Comment this out so we don't make an empty
## '$(glibjdir)' in the install tree.
## glibj_DATA = glibj.zip
endif # INSTALL_GLIBJ_ZIP

48
libjava/classpath/lib/Makefile.in
View file

@ -54,15 +54,7 @@ CONFIG_HEADER = $(top_builddir)/include/config.h
CONFIG_CLEAN_FILES = gen-classlist.sh copy-vmresources.sh
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(glibjdir)"
glibjDATA_INSTALL = $(INSTALL_DATA)
DATA = $(glibj_DATA) $(noinst_DATA)
DATA = $(noinst_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
@ -269,7 +261,6 @@ compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$
# handling source to bytecode compiler programs like gcj, jikes and kjc
@FOUND_GCJ_TRUE@JAVAC = exit 1
JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB)
@INSTALL_GLIBJ_ZIP_TRUE@glibj_DATA = glibj.zip
@BUILD_CLASS_FILES_TRUE@noinst_DATA = genclasses compile-classes resources
EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh
CLEANFILES = compile-classes resources classes \
@ -323,23 +314,6 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
install-glibjDATA: $(glibj_DATA)
@$(NORMAL_INSTALL)
test -z "$(glibjdir)" || $(mkdir_p) "$(DESTDIR)$(glibjdir)"
@list='$(glibj_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(glibjDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(glibjdir)/$$f'"; \
$(glibjDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(glibjdir)/$$f"; \
done
uninstall-glibjDATA:
@$(NORMAL_UNINSTALL)
@list='$(glibj_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(glibjdir)/$$f'"; \
rm -f "$(DESTDIR)$(glibjdir)/$$f"; \
done
tags: TAGS
TAGS:
@ -381,9 +355,6 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(glibjdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@ -429,7 +400,7 @@ info: info-am
info-am:
install-data-am: install-data-local install-glibjDATA
install-data-am: install-data-local
install-exec-am:
@ -455,19 +426,18 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-glibjDATA uninstall-info-am uninstall-local
uninstall-am: uninstall-info-am uninstall-local
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
clean-local dist-hook distclean distclean-generic \
distclean-libtool distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
install-data-local install-exec install-exec-am \
install-glibjDATA install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-glibjDATA uninstall-info-am \
uninstall-local
install-data-local install-exec install-exec-am install-info \
install-info-am install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-info-am uninstall-local
sinclude $(JAVA_DEPEND)