Index: auto/output/Makefile
===================================================================
--- auto/output/Makefile	(revision 9a367616612b9e69c7e0bb155d5b543d50824483)
+++ auto/output/Makefile	(revision c7ecbc244d4b134bbdf0ad3b58fbe5bbf616fd7b)
@@ -5,4 +5,16 @@
 .DEFAULT_GOAL = all
 
+PROJECT_NAME = $PROJECT_NAME
+PROJECT_FULLNAME = $PROJECT_FULLNAME
+PROJECT_COPYRIGHT = $PROJECT_COPYRIGHT
+PROJECT_VERSION = $PROJECT_VERSION
+PROEJCT_PAGE = $PROJECT_PAGE
+PROJECT_MAIL = $PROJECT_MAIL
+
+INSTALL = $INSTALL
+INSTALL_PROGRAM = \$(INSTALL)
+INSTALL_PROGRAM_STRIP = \$(INSTALL) -s
+INSTALL_DATA = \$(INSTALL) -m 644
+INSTALL_DIR = \$(INSTALL) -d
 SHELL = $SHELL
 CC = $CC
@@ -36,9 +48,38 @@
 bindir = $bindir
 sbindir = $sbindir
+libexecdir = $libexecdir
 datarootdir = $datarootdir
 datadir = $datadir
 sysconfdir = $sysconfdir
-sharedstatedir = $sharestatedir
+sharedstatedir = $sharedstatedir
 localstatedir = $localstatedir
+docdir = $docdir
+infodir = $infodir
+htmldir = $htmldir
+dvidir = $dvidir
+pdfdir = $pdfdir
+psdir = $psdir
+libdir = $libdir
+localedir = $localedir
+mandir = $mandir
+man1dir = $man1dir
+man2dir = $man2dir
+man3dir = $man3dir
+man4dir = $man4dir
+man5dir = $man5dir
+man6dir = $man6dir
+man7dir = $man7dir
+man8dir = $man8dir
+man9dir = $man9dir
+manext = $manext
+man1ext = $man1ext
+man2ext = $man2ext
+man3ext = $man3ext
+man4ext = $man4ext
+man5ext = $man5ext
+man6ext = $man6ext
+man7ext = $man7ext
+man8ext = $man8ext
+man9ext = $man9ext
 
 ALL_CFLAGS = \$(CFLAGS)
@@ -50,4 +91,5 @@
 vpath %.c       ./src
 vpath %.l       ./src
+vpath %.ggo     ./src
 vpath %.pl      ./src
 vpath %.sed     ./src
@@ -55,5 +97,7 @@
 vpath %.texinfo ./doc
 
-PROGRAMS = tok sen fla gph kot unfla grp mar ser kon rm12 rs12
+PROGRAMS_SCRIPT = gph kot unfla grp mar ser kon rm12
+PROGRAMS_EXEC = tok sen fla rs12
+PROGRAMS = \$(PROGRAMS_SCRIPT) \$(PROGRAMS_EXEC)
 DOC_FILES = utt.info utt.dvi utt.html utt.pdf utt.ps
 
@@ -110,12 +154,12 @@
 
 .SUFFIXES:
-.SUFFIXES: .l .y .h .c .pl .o
+.SUFFIXES: .l .y .h .c .pl .o .texinfo .info .dvi .html .pdf .ps
 
 .PHONY: help
 help:
-	@\$(MAKE) --print-data-base --question |		\\
+	@\$(MAKE) --print-data-base --question |			\\
 	\$(GREP) '^[^.%][-A-Za-z0-9_]*:' |			\\
 	\$(CUT) -f 1 -d : | 					\\
-	\$(GREP) -v '^Makefile$$' |				\\
+	\$(GREP) -v '^Makefile\$\$' |				\\
 	\$(SORT) |						\\
 	\$(PR) --omit-pagination --width=80 --columns=4
@@ -124,42 +168,80 @@
 all: \$(PROGRAMS)
 
-.PHONY: install
-install: all
-
-.PHONY: install-strip
-install:
+.PHONY: doc
+doc: info dvi html pdf ps
 
 .PHONY: info
 info: utt.info
 
-.PHONY: install-info
-install-info:
-
 .PHONY: dvi
 dvi: utt.dvi
 
-.PHONY: install-dvi
-install-dvi:
-
 .PHONY: html
 html: utt.html
 
-.PHONY: install-html
-install-html:
-
 .PHONY: pdf
 pdf: utt.pdf
 
-.PHONY: install-pdf
-install-pdf:
-
 .PHONY: ps
 ps: utt.ps
 
+.PHONY: install-all
+install-all: install install-doc
+	
+.PHONY: installdirs
+installdirs:
+	\$(INSTALL_DIR) \$(DESTDIR)\$(prefix) \\
+			\$(DESTDIR)\$(exec_prefix) \\
+			\$(DESTDIR)\$(bindir) \\
+			\$(DESTDIR)\$(datarootdir) \\
+			\$(DESTDIR)\$(datadir) \\
+			\$(DESTDIR)\$(docdir) \\
+			\$(DESTDIR)\$(infodir) \\
+			\$(DESTDIR)\$(htmldir) \\
+			\$(DESTDIR)\$(dvidir) \\
+			\$(DESTDIR)\$(pdfdir) \\
+			\$(DESTDIR)\$(psdir) \\
+
+.PHONY: install
+install: installdirs
+	\$(INSTALL_PROGRAM) \$(PROGRAMS) \$(DESTDIR)\$(bindir)
+
+.PHONY: install-strip
+install-strip: installdirs
+	\$(INSTALL_PROGRAM) \$(PROGRAMS_SCRIPT) \$(DESTDIR)\$(bindir)
+	\$(INSTALL_PROGRAM_STRIP) \$(PROGRAMS_EXEC) \$(DESTDIR)\$(bindir)
+
+.PHONY: install-doc
+install-doc: install-info install-dvi install-html install-pdf install-ps
+
+.PHONY: install-info
+install-info: installdirs
+	\$(INSTALL_DATA) utt.info \$(DESTDIR)\$(infodir)
+
+.PHONY: install-dvi
+install-dvi: installdirs
+	\$(INSTALL_DATA) utt.dvi \$(DESTDIR)\$(dvidir)
+
+.PHONY: install-html
+install-html: installdirs
+	\$(INSTALL_DATA) utt.html \$(DESTDIR)\$(htmldir)
+
+.PHONY: install-pdf
+install-pdf: installdirs
+	\$(INSTALL_DATA) utt.pdf \$(DESTDIR)\$(pdfdir)
+
 .PHONY: install-ps
-install-ps:
-	
+install-ps: installdirs
+	\$(INSTALL_DATA) utt.ps \$(DESTDIR)\$(psdir)
+
 .PHONY: uninstall
 uninstall:
+	\$(RM) \$(foreach file,\$(PROGRAMS),\$(DESTDIR)\$(bindir)/\$(file))
+	\$(RM) \$(DESTDIR)\$(infodir)/utt.info
+	\$(RM) \$(DESTDIR)\$(dvidir)/utt.dvi
+	\$(RM) \$(DESTDIR)\$(htmldir)/utt.html
+	\$(RM) \$(DESTDIR)\$(pdfdir)/utt.pdf
+	\$(RM) \$(DESTDIR)\$(psdir)/utt.ps
+	\$(RMDIR) \$(DESTDIR)\$(docdir)
 
 .PHONY: clean
