2007-03-05 Matthias Klose <doko@ubuntu.com>

        * doc/Makefile.am(man_MANS): Add $(TOOLS_MANFILES).
        * doc/Makefile.in: Regenerate.

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

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 0c980f8..f7d7868 100644 (file)
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,8 @@
+2007-03-05  Matthias Klose  <doko@ubuntu.com>
+
+       * doc/Makefile.am(man_MANS): Add $(TOOLS_MANFILES).
+       * doc/Makefile.in: Regenerate.
+

 2007-02-26  Jakub Jelinek  <jakub@redhat.com>
 
        * java/util/TimeZone.java (getDefaultDisplayName): Don't
 2007-02-26  Jakub Jelinek  <jakub@redhat.com>
 
        * java/util/TimeZone.java (getDefaultDisplayName): Don't

diff --git a/libjava/classpath/doc/Makefile.am b/libjava/classpath/doc/Makefile.am
index b5d057a..40b46d9 100644 (file)
--- a/libjava/classpath/doc/Makefile.am
+++ b/libjava/classpath/doc/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_DIST = README.jaxp $(man_MANS)
 
 docs: cp-hacking.ps cp-vmintegration.ps cp-tools.ps
 
 
 docs: cp-hacking.ps cp-vmintegration.ps cp-tools.ps
 

-#man_MANS = $(TOOLS_MANFILES)
+man_MANS = $(TOOLS_MANFILES)

 TOOLS_MANFILES = \
        gappletviewer.1 \
        gjar.1 \
 TOOLS_MANFILES = \
        gappletviewer.1 \
        gjar.1 \

diff --git a/libjava/classpath/doc/Makefile.in b/libjava/classpath/doc/Makefile.in
index 2d52813..753d28c 100644 (file)
--- a/libjava/classpath/doc/Makefile.in
+++ b/libjava/classpath/doc/Makefile.in
@@ -63,6 +63,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        install-recursive installcheck-recursive installdirs-recursive \
        pdf-recursive ps-recursive uninstall-info-recursive \
        uninstall-recursive
        install-recursive installcheck-recursive installdirs-recursive \
        pdf-recursive ps-recursive uninstall-info-recursive \
        uninstall-recursive

+man1dir = $(mandir)/man1
+am__installdirs = "$(DESTDIR)$(man1dir)"
+NROFF = nroff
+MANS = $(man_MANS)

 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)


@@ -297,8 +301,7 @@ toolexeclibdir = @toolexeclibdir@
 vm_classes = @vm_classes@
 SUBDIRS = api
 EXTRA_DIST = README.jaxp $(man_MANS)
 vm_classes = @vm_classes@
 SUBDIRS = api
 EXTRA_DIST = README.jaxp $(man_MANS)

-
-#man_MANS = $(TOOLS_MANFILES)
+man_MANS = $(TOOLS_MANFILES)

 TOOLS_MANFILES = \
        gappletviewer.1 \
        gjar.1 \
 TOOLS_MANFILES = \
        gappletviewer.1 \
        gjar.1 \


@@ -359,6 +362,51 @@ clean-libtool:
 distclean-libtool:
        -rm -f libtool
 uninstall-info-am:
 distclean-libtool:
        -rm -f libtool
 uninstall-info-am:

+install-man1: $(man1_MANS) $(man_MANS)
+       @$(NORMAL_INSTALL)
+       test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+       @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+       l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+       for i in $$l2; do \
+         case "$$i" in \
+           *.1*) list="$$list $$i" ;; \
+         esac; \
+       done; \
+       for i in $$list; do \
+         if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+         else file=$$i; fi; \
+         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+         case "$$ext" in \
+           1*) ;; \
+           *) ext='1' ;; \
+         esac; \
+         inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+         inst=`echo $$inst | sed -e 's/^.*\///'`; \
+         inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+         echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+         $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+       done
+uninstall-man1:
+       @$(NORMAL_UNINSTALL)
+       @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+       l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+       for i in $$l2; do \
+         case "$$i" in \
+           *.1*) list="$$list $$i" ;; \
+         esac; \
+       done; \
+       for i in $$list; do \
+         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+         case "$$ext" in \
+           1*) ;; \
+           *) ext='1' ;; \
+         esac; \
+         inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+         inst=`echo $$inst | sed -e 's/^.*\///'`; \
+         inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+         echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+         rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+       done

 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.


@@ -536,9 +584,12 @@ distdir: $(DISTFILES)
        done
 check-am: all-am
 check: check-recursive
        done
 check-am: all-am
 check: check-recursive

-all-am: Makefile
+all-am: Makefile $(MANS)

 installdirs: installdirs-recursive
 installdirs-am:
 installdirs: installdirs-recursive
 installdirs-am:

+       for dir in "$(DESTDIR)$(man1dir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done

 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive


@@ -582,13 +633,13 @@ info: info-recursive
 
 info-am:
 
 
 info-am:
 

-install-data-am:
+install-data-am: install-man

 
 install-exec-am:
 
 install-info: install-info-recursive
 
 
 install-exec-am:
 
 install-info: install-info-recursive
 

-install-man:
+install-man: install-man1

 
 installcheck-am:
 
 
 installcheck-am:
 


@@ -608,22 +659,25 @@ ps: ps-recursive
 
 ps-am:
 
 
 ps-am:
 

-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-man

 
 uninstall-info: uninstall-info-recursive
 
 
 uninstall-info: uninstall-info-recursive
 

+uninstall-man: uninstall-man1
+

 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
        clean clean-generic clean-libtool clean-recursive ctags \
        ctags-recursive distclean distclean-generic distclean-libtool \
        distclean-recursive distclean-tags distdir dvi dvi-am html \
        html-am info info-am install install-am install-data \
        install-data-am install-exec install-exec-am install-info \
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
        clean clean-generic clean-libtool clean-recursive ctags \
        ctags-recursive distclean distclean-generic distclean-libtool \
        distclean-recursive distclean-tags distdir dvi dvi-am html \
        html-am info info-am install install-am install-data \
        install-data-am install-exec install-exec-am install-info \

-       install-info-am install-man install-strip installcheck \
-       installcheck-am installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic maintainer-clean-recursive \
-       mostlyclean mostlyclean-generic mostlyclean-libtool \
-       mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-       uninstall uninstall-am uninstall-info-am
+       install-info-am install-man install-man1 install-strip \
+       installcheck installcheck-am installdirs installdirs-am \
+       maintainer-clean maintainer-clean-generic \
+       maintainer-clean-recursive mostlyclean mostlyclean-generic \
+       mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+       tags tags-recursive uninstall uninstall-am uninstall-info-am \
+       uninstall-man uninstall-man1

 
 
 %.dvi : %.texinfo
 
 
 %.dvi : %.texinfo