From: Angus Leeming <leeming@lyx.org>
Date: Fri, 7 Jul 2006 16:21:45 +0000 (+0000)
Subject: Fix the fix so that it actually works ;-)
X-Git-Tag: 1.6.10~12995
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7c0e56ff5d740ec2fc46ab34069329cfca6a44ee;p=lyx.git

Fix the fix so that it actually works ;-)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14366 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/Win32/packaging/dtl/man2ps b/development/Win32/packaging/dtl/man2ps
index a74da6746b..6f3bd32e2c 100644
--- a/development/Win32/packaging/dtl/man2ps
+++ b/development/Win32/packaging/dtl/man2ps
@@ -20,15 +20,24 @@ case `basename $0` in
 esac
 
 # We can use either GNU groff or Sun Solaris troff + dpost
-if [ which groff > /dev/null ]
-then	# GNU groff
+TROFF=
+which groff > /dev/null && {
+	# GNU groff
 	TROFF="groff $FORMAT"
 	TROFF2PS="cat"
-elif [ which dpost > /dev/null ]
-then	# Solaris 2.1
-	TROFF="troff $FORMAT"
-	TROFF2PS="/usr/lib/lp/postscript/dpost"
-else
+}
+
+if [ -z "$TROFF" ]
+then
+	which dpost > /dev/null && {
+		# Solaris 2.1
+		TROFF="troff $FORMAT"
+		TROFF2PS="/usr/lib/lp/postscript/dpost"
+	}
+fi
+
+if [ -z "$TROFF" ]
+then
 	echo "Cannot find troff-to-PostScript filter" >&2
 	exit 1
 fi