gtk: Use new install-html. Implement install-{info,html} targets.

Punt targets for nonexistent documentation in src/gl/Makefile.in.

diff --git a/src/gl/Makefile.in b/src/gl/Makefile.in
index d288f26df2307a7deb4e83afb35314c93878ae4b..70430441ebbe803a2bed70a2e26f58dee9352045 100644 (file)
--- a/src/gl/Makefile.in
+++ b/src/gl/Makefile.in
@@ -38,16 +38,7 @@ glxgears: glxgears-shim.so glxgears-types.bin glxgears-const.bin
        @if [ -s glxgears-unx.crf ]; then \
            echo "glxgears-unx.crf:0: warning: non-empty"; exit 1; fi
 
-doc: mit-scheme-gl.info
-doc: mit-scheme-gl.html
-
-mit-scheme-gl.info: gl.texinfo
-       makeinfo --no-split --output=$@ $^
-
-mit-scheme-gl.html: gl.texinfo
-       makeinfo --html --no-split --output=$@ $^
-
-.PHONY: all check doc
+.PHONY: all check glxgears
 
 install:
        ( echo '(begin'; \
@@ -55,10 +46,6 @@ install:
          echo '  (install-load-option "$(DESTDIR)" "gl"))' ) \
        | $(exe) -- gl gl-glx gl-glxgears *.pkd make.scm
 
-# install-doc:
-#      echo '(install-info "gl")' | $(exe)
-#      echo '(install-html "gl")' | $(exe)
-
 .PHONY: install
 
 clean:

diff --git a/src/gtk/Makefile.in b/src/gtk/Makefile.in
index 7e6fb32bea06b12ff318d4b0bb18e356d8d2ff50..49aee47cd511c342ee87b5e76e00eb9f84dd7738 100644 (file)
--- a/src/gtk/Makefile.in
+++ b/src/gtk/Makefile.in
@@ -25,6 +25,10 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 
+prefix = @prefix@
+datarootdir = @datarootdir@
+infodir = @infodir@
+
 all: gtk-shim.so gtk-types.bin gtk-const.bin
        echo '(load "compile")' | $(exe)
        @if [ -s gtk-unx.crf ]; then \
@@ -52,11 +56,14 @@ install:
          echo '  (install-load-option "$(DESTDIR)" "gtk"))' ) \
        | $(exe) -- *.com *.bci *.pkd make.scm conses.png
 
-# install-doc:
-#      echo '(install-info "gtk")' | $(exe)
-#      echo '(install-html "gtk")' | $(exe)
+install-info: mit-scheme-gtk.info
+       install $< $(DESTDIR)$(infodir)/
+       install-info $< $(DESTDIR)$(infodir)/dir
+
+install-html: mit-scheme-gtk.html
+       echo "(install-html \"$(DESTDIR)\" \"GNOME interface\")" | $(exe) -- $<
 
-.PHONY: install
+.PHONY: install install-info install-html
 
 clean:
        rm -f gtk-const.scm gtk-const gtk-const.c gtk-shim.c