1.89 rel work

willemdj · Sep 25, 2010 · f5e6004 · f5e6004
1 parent f3bfae3
commit f5e6004
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/doc/yaws.tex b/doc/yaws.tex
@@ -1,16 +1,6 @@
 \documentclass[11pt,oneside,english]{book}
-\newif\ifpdf
-\ifx\pdfoutput\undefined
-   \pdffalse              % we are not running PDFLaTeX
-\else
-   \ifnum \pdfoutput=0    % we are running PDFLaTeX generating DVI
-      \pdffalse
-   \else
-      \ifnum \pdfoutput=1 % we are running PDFLaTeX generating PDF
-      \pdftrue
-      \fi
-   \fi
-\fi
+
+\usepackage{ifpdf}
 
 \ifpdf
   \usepackage[pdftex]{graphicx}

diff --git a/win32/mkinstaller.sh b/win32/mkinstaller.sh
@@ -59,17 +59,23 @@ done
 
 
 # Convert readable files to DOS style:
-
-which unix2dos
-if [ $? != 0 ]; then
-    echo "No unix2dos program found";
+TODOS=""
+if [ -x /usr/bin/unix2dos ]; then
+    TODOS=/usr/bin/unix2dos
+fi
+if [ -x /usr/bin/todos ]; then
+    TODOS=/usr/bin/todos
+fi
+if [ "$TODOS" = "" ]; then
+    echo "No unix2dos/todos program found";
+    echo "Run aptitude install tofrodos";
     exit 1
 fi
 
-unix2dos LICENCE.txt
+${TODOS} LICENCE.txt
 for d in `echo ${DIRS0} ${DIRS1}`; do
     for suffix in txt erl conf html yaws js pem; do
-        find . -name "*.$suffix" -exec unix2dos {} \;
+        find . -name "*.$suffix" -exec ${TODOS} {} \;
     done
 done