Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

1.89 rel work

  • Loading branch information...
commit f5e6004176f8eca4a66fd26fbebf0112faf7a646 1 parent f3bfae3
@klacke authored
Showing with 14 additions and 18 deletions.
  1. +2 −12 doc/yaws.tex
  2. +12 −6 win32/mkinstaller.sh
View
14 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}
View
18 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
Please sign in to comment.
Something went wrong with that request. Please try again.