From 981fa57201d795a9bce0948557fc9e426a0bcbf1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 13 Jan 2006 21:26:55 +0000 Subject: [PATCH] classpath.security: Removed. * java/security/classpath.security: Removed. * Makefile.in: Rebuilt. * Makefile.am (install-data-local): Don't install classpath.security. From-SVN: r109675 --- libjava/ChangeLog | 7 +++++++ libjava/Makefile.am | 2 +- libjava/Makefile.in | 2 +- libjava/java/security/classpath.security | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 libjava/java/security/classpath.security diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e8060abf1b2..0da77f3ffac 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2006-01-13 Tom Tromey + + * java/security/classpath.security: Removed. + * Makefile.in: Rebuilt. + * Makefile.am (install-data-local): Don't install + classpath.security. + 2006-01-08 Chris Burdess * java/lang/Character.java (toChars,toCodePoint): Correct these diff --git a/libjava/Makefile.am b/libjava/Makefile.am index d01645fffcb..b5ec81985e0 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 66e5fc5c3c7..005c118a59b 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 8596a6e765d..00000000000 --- a/libjava/java/security/classpath.security +++ /dev/null @@ -1 +0,0 @@ -security.provider.1=gnu.java.security.provider.Gnu