diff options
| author | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-01-17 18:09:40 +0000 |
|---|---|---|
| committer | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-01-17 18:09:40 +0000 |
| commit | 2d8cf20d0d5ca6b1fbdefc22229d4b7cf1497ede (patch) | |
| tree | c976ca91e3ef0bda3b34b37c0195145638d8d08e /libjava/classpath/examples/Makefile.am | |
| parent | a3ef37ddfeddcc5b0f1c5068d8fdeb25a302d5cd (diff) | |
| download | ppe42-gcc-2d8cf20d0d5ca6b1fbdefc22229d4b7cf1497ede.tar.gz ppe42-gcc-2d8cf20d0d5ca6b1fbdefc22229d4b7cf1497ede.zip | |
Imported GNU Classpath 0.20
* Makefile.am (AM_CPPFLAGS): Add classpath/include.
* java/nio/charset/spi/CharsetProvider.java: New override file.
* java/security/Security.java: Likewise.
* sources.am: Regenerated.
* Makefile.in: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109831 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/examples/Makefile.am')
| -rw-r--r-- | libjava/classpath/examples/Makefile.am | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libjava/classpath/examples/Makefile.am b/libjava/classpath/examples/Makefile.am index 341fc5e8e23..db6cac0d686 100644 --- a/libjava/classpath/examples/Makefile.am +++ b/libjava/classpath/examples/Makefile.am @@ -53,25 +53,25 @@ install-data-local: for file in $(ALL_EXAMPLE_FILES); do \ f=`echo $$file | cut -c$$srcdir_cnt-`; \ fdir=`dirname $$f`; \ - if test ! -d $(DESTDIR)/$(pkgdatadir)/examples/$$fdir; then \ - echo "$(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/examples/$$fdir"; \ - $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/examples/$$fdir; \ + if test ! -d $(DESTDIR)$(pkgdatadir)/examples/$$fdir; then \ + echo "$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/examples/$$fdir"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/examples/$$fdir; \ fi; \ - echo "$(INSTALL_DATA) $$file $(DESTDIR)/$(pkgdatadir)/examples/$$f"; \ - $(INSTALL_DATA) $$file $(DESTDIR)/$(pkgdatadir)/examples/$$f; \ + echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/examples/$$f"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/examples/$$f; \ done - echo "$(INSTALL_DATA) Makefile.jawt $(DESTDIR)/$(pkgdatadir)/examples/" - $(INSTALL_DATA) Makefile.jawt $(DESTDIR)/$(pkgdatadir)/examples/ + echo "$(INSTALL_DATA) Makefile.jawt $(DESTDIR)$(pkgdatadir)/examples/" + $(INSTALL_DATA) Makefile.jawt $(DESTDIR)$(pkgdatadir)/examples/ uninstall-local: srcdir_cnt=`echo $(srcdir) | wc -c`; \ for file in $(ALL_EXAMPLE_FILES); do \ f=`echo $$file | cut -c$$srcdir_cnt-`; \ - echo "rm -f $(DESTDIR)/$(pkgdatadir)/examples/$$f"; \ - rm -f $(DESTDIR)/$(pkgdatadir)/examples/$$f; \ + echo "rm -f $(DESTDIR)$(pkgdatadir)/examples/$$f"; \ + rm -f $(DESTDIR)$(pkgdatadir)/examples/$$f; \ done - echo "rm -f $(DESTDIR)/$(pkgdatadir)/examples/Makefile.jawt" - rm -f $(DESTDIR)/$(pkgdatadir)/examples/Makefile.jawt + echo "rm -f $(DESTDIR)$(pkgdatadir)/examples/Makefile.jawt" + rm -f $(DESTDIR)$(pkgdatadir)/examples/Makefile.jawt # Make sure everything is included in the distribution. EXTRA_DIST = README Makefile.jawt.in |
