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.

git-svn-id: svn://svn.tartarus.org/sgt/putty@5271 cda61777-01e9-0310-a592-d414129be87e

diff --git a/mac/mkputty.mpw b/mac/mkputty.mpw
index 49c46b2..92156c7 100644 (file)
--- a/mac/mkputty.mpw
+++ b/mac/mkputty.mpw
@@ -1 +1,15 @@
-# $Id$\r\rSet makefile Makefile.mpw\r\r#   Run Make, then execute its output.\r\rEcho "# `Date -t` ----- Analyzing dependencies."\rBegin\r     Echo "Set Echo 1"\r      Make {"Parameters"} -f "{makefile}"\rEnd > make.out\rEcho "# `Date -t` ----- Executing build commands."\rmake.out\rDelete make.out\rEcho "# `Date -t` ----- Done."\r
\ 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 da5b990..2407a49 100755 (executable)
--- 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