From ba793c905f34c63773dcb74c11e71d859e9775b7 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 7 Feb 2005 20:24:13 +0000
Subject: [PATCH] Revert my LF->CR change following Owen's comment that it
actually breaks netatalk-based setups (which _swap_ LF and CR). Instead,
setfile.sh (which I have to run _anyway_ on OS X) copies mkputty.mpw to
mk.mpw and then makes that CR-based.
[originally from svn r5271]
---
mac/mkputty.mpw | 16 +++++++++++++++-
mac/setfile.sh | 5 ++++-
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/mac/mkputty.mpw b/mac/mkputty.mpw
index 49c46b2a..92156c7b 100644
--- a/mac/mkputty.mpw
+++ b/mac/mkputty.mpw
@@ -1 +1,15 @@
-# $Id$
Set makefile Makefile.mpw
# Run Make, then execute its output.
Echo "# `Date -t` ----- Analyzing dependencies."
Begin
Echo "Set Echo 1"
Make {"Parameters"} -f "{makefile}"
End > make.out
Echo "# `Date -t` ----- Executing build commands."
make.out
Delete make.out
Echo "# `Date -t` ----- Done."
\ No newline at end of file
+# $Id$
+
+Set makefile Makefile.mpw
+
+# Run Make, then execute its output.
+
+Echo "# `Date -t` ----- Analyzing dependencies."
+Begin
+ Echo "Set Echo 1"
+ Make {"Parameters"} -f "{makefile}"
+End > make.out
+Echo "# `Date -t` ----- Executing build commands."
+make.out
+Delete make.out
+Echo "# `Date -t` ----- Done."
diff --git a/mac/setfile.sh b/mac/setfile.sh
index da5b990a..2407a496 100755
--- a/mac/setfile.sh
+++ b/mac/setfile.sh
@@ -19,4 +19,7 @@ fi
# Now we can assume we're in the main PuTTY source dir.
find . -name .svn -prune -o -name '*.[chr]' -exec $SETFILE -t TEXT {} \;
-$SETFILE -t TEXT mac/mkputty.mpw
+
+# CR-ise mkputty.mpw and set the new version to TEXT.
+tr '\n' '\r' < mac/mkputty.mpw > mac/mk.mpw
+$SETFILE -t TEXT mac/mk.mpw