diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-01-13 21:26:55 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-01-13 21:26:55 +0000 |
| commit | 981fa57201d795a9bce0948557fc9e426a0bcbf1 (patch) | |
| tree | 78fe6ad04b07c222feb2cef83bac86f2c3bd8963 | |
| parent | b5cbe7eee3cb428d07035b33c3d79684684e93bd (diff) | |
| download | gcc-981fa57201d795a9bce0948557fc9e426a0bcbf1.zip gcc-981fa57201d795a9bce0948557fc9e426a0bcbf1.tar.gz gcc-981fa57201d795a9bce0948557fc9e426a0bcbf1.tar.bz2 | |
classpath.security: Removed.
* java/security/classpath.security: Removed.
* Makefile.in: Rebuilt.
* Makefile.am (install-data-local): Don't install
classpath.security.
From-SVN: r109675
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/Makefile.in | 2 | ||||
| -rw-r--r-- | libjava/java/security/classpath.security | 1 |
4 files changed, 9 insertions, 3 deletions
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 |