From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Thu, 8 May 2014 17:17:35 +0000 (-0700)
Subject: gtk: Use new install-html.  Implement install-{info,html} targets.
X-Git-Tag: mit-scheme-pucked-9.2.12~409
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=72a590f8444e56ff8a885b8cd293a81d2a96a6bb;p=mit-scheme.git

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 d288f26df..70430441e 100644
--- 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 7e6fb32be..49aee47cd 100644
--- 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