For PR libgcj/5303:

[pf3gnuchains/gcc-fork.git] / gcc / java / Make-lang.in

diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index cb44d23..99724b3 100644 (file)
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -1,6 +1,6 @@
 # Top level makefile fragment for the GNU compiler for the Java(TM)
 # language.
-#   Copyright (C) 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+#   Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 #This file is part of GNU CC.
 
@@ -53,7 +53,7 @@ GCJ = gcj
 java: jc1$(exeext) $(GCJ)$(exeext) jvgenmain$(exeext) \
       gcjh$(exeext) jv-scan$(exeext) jcf-dump$(exeext)
 
-# Define the name of target independant tools to be installed in $(bindir)
+# Define the name of target independent tools to be installed in $(bindir)
 # Names are subject to changes
 JAVA_TARGET_INDEPENDENT_BIN_TOOLS = gcjh jv-scan jcf-dump
 
@@ -90,7 +90,7 @@ $(srcdir)/java/parse-scan.c:  $(srcdir)/java/parse-scan.y
 
 $(srcdir)/java/keyword.h: $(srcdir)/java/keyword.gperf
        (cd $(srcdir)/java || exit 1; \
-       gperf -L C -F ', 0' -p -t -j1 -i 1 -g -o -N java_keyword -k1,4,$$ \
+       gperf -L C -C -F ', 0' -p -t -j1 -i 1 -g -o -N java_keyword -k1,4,$$ \
                keyword.gperf > k$$$$.h || { \
        echo "Please update gperf from ftp://ftp.gnu.org/pub/gnu/gperf/" >&2; \
        rm -f k$$$$.h; \
@@ -151,7 +151,7 @@ java.info: $(srcdir)/java/gcj.info
 java.dvi: java/gcj.dvi
 java.generated-manpages: $(srcdir)/java/gcj.1 $(srcdir)/java/gcjh.1 \
        $(srcdir)/java/jv-scan.1 $(srcdir)/java/jcf-dump.1 \
-       $(srcdir)/java/gij.1
+       $(srcdir)/java/gij.1 $(srcdir)/java/jv-convert.1
 
 # Install hooks:
 # jc1, gcj, jvgenmain, and gcjh are installed elsewhere as part
@@ -192,6 +192,7 @@ java.uninstall:
        -rm -rf $(man1dir)/jv-scan$(man1ext)
        -rm -rf $(man1dir)/jcf-dump$(man1ext)
        -rm -rf $(man1dir)/gij$(man1ext)
+       -rm -rf $(man1dir)/jv-convert$(man1ext)
 
 java.install-info: installdirs
        if [ -f jc1$(exeext) ] ; then \
@@ -228,6 +229,7 @@ java.maintainer-clean:
        -rm -f $(srcdir)/java/gcj.1 $(srcdir)/java/gcjh.1
        -rm -f $(srcdir)/java/jv-scan.1 $(srcdir)/java/jcf-dump.1
        -rm -f $(srcdir)/java/gij.1
+       -rm -f $(srcdir)/java/jv-convert.1
 #\f
 # Stage hooks:
 # The main makefile has already created stage?/java.
@@ -356,6 +358,13 @@ $(srcdir)/java/gij.1: $(srcdir)/java/gcj.texi
                (rm -f java/gij.1.T$$$$ && exit 1)
        rm -f java/gij.pod
 
+$(srcdir)/java/jv-convert.1: $(srcdir)/java/gcj.texi
+       -$(TEXI2POD) -D jv-convert < $(srcdir)/java/gcj.texi > java/jv-convert.pod
+       ($(POD2MAN) --section=1 java/jv-convert.pod > java/jv-convert.1.T$$$$ && \
+               mv -f java/jv-convert.1.T$$$$ $(srcdir)/java/jv-convert.1) || \
+               (rm -f java/jv-convert.1.T$$$$ && exit 1)
+       rm -f java/jv-convert.pod
+
 # Install the man pages.
 java.install-man: installdirs $(GENERATED_JAVA_MANPAGES)
        -if [ -f $(GCJ)$(exeext) ]; then \
@@ -381,3 +390,6 @@ java.install-man: installdirs $(GENERATED_JAVA_MANPAGES)
        -rm -f $(man1dir)/gij$(man1ext)
        -$(INSTALL_DATA) $(srcdir)/java/gij.1 $(man1dir)/gij$(man1ext)
        -chmod a-x $(man1dir)/gij$(man1ext)
+       -rm -f $(man1dir)/jv-convert$(man1ext)
+       -$(INSTALL_DATA) $(srcdir)/java/jv-convert.1 $(man1dir)/jv-convert$(man1ext)
+       -chmod a-x $(man1dir)/jv-convert$(man1ext)