From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 13 Jan 2006 21:26:55 +0000 (+0000)
Subject: 	* java/security/classpath.security: Removed.
X-Git-Tag: upstream/4.9.2~56544
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ccef4ce5c270f581631359f51277f5b06d37034b;p=platform%2Fupstream%2Flinaro-gcc.git

	* java/security/classpath.security: Removed.
	* Makefile.in: Rebuilt.
	* Makefile.am (install-data-local): Don't install
	classpath.security.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e8060ab..0da77f3 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-13  Tom Tromey  <tromey@redhat.com>
+
+	* java/security/classpath.security: Removed.
+	* Makefile.in: Rebuilt.
+	* Makefile.am (install-data-local): Don't install
+	classpath.security.
+
 2006-01-08  Chris Burdess  <dog@gnu.org>
 
 	* java/lang/Character.java (toChars,toCodePoint): Correct these
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index d01645f..b5ec819 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -562,7 +562,7 @@ install-data-local:
 ## FIXME: the obvious approach using lib_DATA doesn't work with
 ## automake 1.4.
 	$(mkinstalldirs) $(DESTDIR)$(secdir)
-	@for f in classpath.security libgcj.security; do \
+	@for f in libgcj.security; do \
 	  echo " $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f"; \
 	  $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f; \
 	done
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 66e5fc5..005c118 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -9301,7 +9301,7 @@ install-data-local:
 	done
 	-@rm -f tmp-ilist
 	$(mkinstalldirs) $(DESTDIR)$(secdir)
-	@for f in classpath.security libgcj.security; do \
+	@for f in libgcj.security; do \
 	  echo " $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f"; \
 	  $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f; \
 	done
diff --git a/libjava/java/security/classpath.security b/libjava/java/security/classpath.security
deleted file mode 100644
index 8596a6e..0000000
--- a/libjava/java/security/classpath.security
+++ /dev/null
@@ -1 +0,0 @@
-security.provider.1=gnu.java.security.provider.Gnu