From: Tom Yu <tlyu@mit.edu>
Date: Tue, 18 Oct 2011 20:19:15 +0000 (+0000)
Subject: pull up r24909 from trunk
X-Git-Tag: krb5-1.8.5-beta1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d365e4b2296f5b1a888308bac6c426a50aec89a;p=thirdparty%2Fkrb5.git

pull up r24909 from trunk

 ------------------------------------------------------------------------
 r24909 | tlyu | 2011-05-02 16:57:23 -0400 (Mon, 02 May 2011) | 7 lines

 ticket: 6906
 subject: modernize doc/Makefile somewhat
 status: open

 Modernize doc/Makefile somewhat so that it can run more usefully on
 modern non-Athena machines.

ticket: 6984
version_fixed: 1.8.5
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@25375 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/doc/Makefile b/doc/Makefile
index 8572ff5d8d..5c62dfd677 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
 SRCDIR=../src
-DVI=texi2dvi4a2ps	# texi2dvi
+DVI=texi2dvi
 DVIPS=dvips -o "$@"
 PSPDF=ps2pdf
 INFO=makeinfo
@@ -9,7 +9,8 @@ TAR=tar -chvf
 GZIP=gzip -9
 MANPS=./man2ps
 MANTXT=nroff -man 
-MANHTML=./man2html
+PERL=perl
+MANHTML=$(PERL) man2html
 
 ADMIN_INCLUDES=definitions.texinfo copyright.texinfo document-list.texinfo \
 	glossary.texinfo support-enc.texinfo salts.texinfo krb5conf.texinfo \