Fix new automake warnings

doc/Makefile.am

@@ -296,7 +296,7 @@ descriptions-external.db: $(DESC_FILES) ../tools/sane-desc
 	  > descriptions-external.db
 
 html-pages: $(HTML_PAGES)
-html: html-pages html-man sane-html
+html-local: html-pages html-man sane-html
 
 clean-local:
 	rm -f *.toc *.aux *.log *.cp *.fn *.tp *.vr *.pg *.ky *.blg *.idx *.cb

japi/Makefile.am

@@ -9,8 +9,8 @@
 #
 
 JAVAROOT=.
-CLASSPATH_ENV=.
-JAVAH=javah -jni -cp $(CLASSPATH_ENV)
+MY_CLASSPATH=.
+JAVAH=javah -jni -cp $(MY_CLASSPATH)
 
 #	We'll need something in 'configure' for the Java includes.
 AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include \