From 9a88b1d8bed9152499f6e39cec3e9476251cb057 Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Fri, 7 Jul 2006 14:05:23 +0000
Subject: [PATCH] * Enable man2ps to work without hard-coding the locations of
 groff or dpost. * Re-add whitespace fluff to {dvi,dtl}.doc --- minimize
 change to original package. * Enable man2ps (and hence doc) targets in
 Makefile to build out of the box.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14359 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/Win32/packaging/dtl/Makefile | 5 ++---
 development/Win32/packaging/dtl/dtl.doc  | 6 +++---
 development/Win32/packaging/dtl/dvi.doc  | 2 +-
 development/Win32/packaging/dtl/man2ps   | 6 +++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/development/Win32/packaging/dtl/Makefile b/development/Win32/packaging/dtl/Makefile
index 5cf9c8e384..5966cd5273 100644
--- a/development/Win32/packaging/dtl/Makefile
+++ b/development/Win32/packaging/dtl/Makefile
@@ -60,12 +60,11 @@ DTL_DBN		= $(DOCS) $(SRC) $(TESTS)
 	$(DITROFF) -man -Tascii $< | $(COL) >$@
 
 .man.ps:
-	$(MAN2PS) < $< > $@
+	$(MAN2PS) $< > $@
 
 #=======================================================================
 
-#all:  dtl check doc
-all:  dtl check
+all:  dtl check doc
 
 doc:  dt2dv.hlp dv2dt.hlp dt2dv.ps dv2dt.ps
 
diff --git a/development/Win32/packaging/dtl/dtl.doc b/development/Win32/packaging/dtl/dtl.doc
index a6f444f647..b170e0f2db 100644
--- a/development/Win32/packaging/dtl/dtl.doc
+++ b/development/Win32/packaging/dtl/dtl.doc
@@ -13,7 +13,7 @@ ASCII text representation of a DVI file.
 
 References for DVI file structure:
 ----------------------------------
-
+ 
 In this distribution:
 
         dvi.doc
@@ -21,7 +21,7 @@ In this distribution:
 In the TeX archives:
 
         CTAN:  dviware/driv-standard/level-0/dvistd0.tex
-
+ 
     "The DVI Driver Standard, Level 0",
     by  The TUG DVI Driver Standards Committee  (now defunct)
     chaired by Joachim Schrod.
@@ -39,7 +39,7 @@ The other DTL commands correspond one-to-one with DVI commands, but I
 have used briefer names (except for `special') than those used in the
 DVI standards document.
 
-    DTL  :  DVI
+    DTL  :  DVI 
 
     (text)  :  series of set_char commands, for printable ASCII text
     \(   :  literal ASCII left parenthesis in (text)
diff --git a/development/Win32/packaging/dtl/dvi.doc b/development/Win32/packaging/dtl/dvi.doc
index 5e576c90c8..738d871ba0 100644
--- a/development/Win32/packaging/dtl/dvi.doc
+++ b/development/Win32/packaging/dtl/dvi.doc
@@ -22,7 +22,7 @@ DVI Commands
 Listed in the free format:
 "Opcode  Symbol  Parameter[Signed? Bytes]  ...  Action".
 
-
+    
     0    set_char_0    -  set character 0 from current font
     ...
     127  set_char_127  -  set character 127 from current font
diff --git a/development/Win32/packaging/dtl/man2ps b/development/Win32/packaging/dtl/man2ps
index 8d0f230443..a74da6746b 100644
--- a/development/Win32/packaging/dtl/man2ps
+++ b/development/Win32/packaging/dtl/man2ps
@@ -20,16 +20,16 @@ case `basename $0` in
 esac
 
 # We can use either GNU groff or Sun Solaris troff + dpost
-if [ -x /usr/local/bin/groff ]
+if [ which groff > /dev/null ]
 then	# GNU groff
 	TROFF="groff $FORMAT"
 	TROFF2PS="cat"
-elif [ -x /usr/lib/lp/postscript/dpost ]
+elif [ which dpost > /dev/null ]
 then	# Solaris 2.1
 	TROFF="troff $FORMAT"
 	TROFF2PS="/usr/lib/lp/postscript/dpost"
 else
-	echo "Cannot find troff-to-PostScript filter"
+	echo "Cannot find troff-to-PostScript filter" >&2
 	exit 1
 fi
 
-- 
2.39.2