classpath.security: Removed.

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

From-SVN: r109675

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e8060abf1b2cf5cbd7c85018c0364bea3ede97b4..0da77f3ffac74023046751d5e669f1c956066e3e 100644 (file)
--- 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 d01645fffcb00634299fbec81a0378dfc1835948..b5ec81985e094e8ca6b054dbce7a5d981d916211 100644 (file)
--- 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 66e5fc5c3c77b49040d61a78992b462de9da0dec..005c118a59bb1753ffa2562be1f1431512f231f6 100644 (file)
--- 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 (file)
index 8596a6e..0000000
--- a/libjava/java/security/classpath.security
+++ /dev/null
@@ -1 +0,0 @@
-security.provider.1=gnu.java.security.provider.Gnu