From: Akim Demaille <akim@epita.fr>
Date: Mon, 23 Oct 2000 18:58:33 +0000 (+0000)
Subject: * aclocal.in (write_aclocal): Don't write aclocal.m4 with
X-Git-Tag: Release-1-4b~29
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=303b2707aff67641b3892336e221e61add3ecb1b;p=automake.git

* aclocal.in (write_aclocal): Don't write aclocal.m4 with
CRLFs. This circumvents a bug in Cygwin bash.

* automake.in (generate_makefile): Don't write Makefile.in
files with CRLFs, as it causes problems for the dependency-file
extraction in AM_OUTPUT_DEPENDENCY_COMMANDS.
---

diff --git a/ChangeLog b/ChangeLog
index aaed042c..52037eef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-10-23  Morten Eriksen  <mortene@sim.no>
+
+	* aclocal.in (write_aclocal): Don't write aclocal.m4 with
+	CRLFs. This circumvents a bug in Cygwin bash.
+
+	* automake.in (generate_makefile): Don't write Makefile.in
+	files with CRLFs, as it causes problems for the dependency-file
+	extraction in AM_OUTPUT_DEPENDENCY_COMMANDS.
+
 2000-10-19  Alex Hornby  <alex@anvil.co.uk>
 
 	* automake.in (handle_merge_targets): Allow parallel install
diff --git a/aclocal.in b/aclocal.in
index 7c9e9a2e..d35a64a5 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -427,6 +427,13 @@ sub write_aclocal
 
     print STDERR "Writing $output_file\n" if $verbosity;
 
+
+    # In case we're running under MSWindows, don't write with CRLF.
+    # (This circumvents a bug in at least Cygwin bash where the shell
+    # parsing fails on lines ending with the continuation character '\'
+    # and CRLF.)
+    binmode ACLOCAL;
+
     open (ACLOCAL, "> " . $output_file)
 	|| die "aclocal: couldn't open \`$output_file' for writing: $!\n";
     print ACLOCAL "# $output_file generated automatically by aclocal $VERSION\n";
diff --git a/automake.in b/automake.in
index 89d2619e..d8254e5d 100755
--- a/automake.in
+++ b/automake.in
@@ -690,6 +690,11 @@ sub generate_makefile
     }
     print "automake: creating ", $makefile, ".in\n" if $verbose;
 
+    # In case we're running under MSWindows, don't write with CRLF
+    # (as it causes problems for the dependency-file extraction in
+    # AM_OUTPUT_DEPENDENCY_COMMANDS).
+    binmode GM_FILE;
+
     print GM_FILE $output_vars;
     # We make sure that `all:' is the first target.
     print GM_FILE $output_all;