[svn] Don't generate configure.bat, just use it.

diff --git a/ChangeLog b/ChangeLog
index 441ca58cf1f09f74ad9a31ad72ca982d9de52533..1e2a89b301a683fc2b6b2853cf5a2705d0841e6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-25  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * Makefile.in: Instead of creating configure.bat from
+       configure.bat.in, simply make sure the correct EOL style in
+       checked out of the repository.
+
 2005-06-24  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * configure.in: Move the large file check further up.  Only check

diff --git a/Makefile.in b/Makefile.in
index ed7ed8bd656996d8bfb4531cf06f3fdf184f333c..54acb2c1592ae2f7f20203a6092e1467779bf223 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,17 +107,11 @@ install.info uninstall.info install.man uninstall.man install.wgetrc:
 install.mo:
        cd po && $(MAKE) $(MAKEDEFS) $@
 
-# Create configure.bat from configure.bat.in by DOS-ifying the lines.
-# This is invoked by `make dist' and deleted by `make realclean' (not
-# `make distclean' because we want to preserve it for distribution).
-configure.bat: $(srcdir)/configure.bat.in
-       awk '{ print $$0 ($$0 ~ /\r$$/ ? "" : "\r") }' $< > $@
-
 # create tag files for Emacs
 TAGS:
        cd src && $(MAKE) $@
 
-dist: $(srcdir)/configure $(srcdir)/configure.bat DISTFILES
+dist: $(srcdir)/configure DISTFILES
        mkdir $(DISTNAME)
        for d in `$(FIND) . -type d ! -name CVS -a ! -name RCS -print`; do \
                if [ "$$d" != "." -a "$$d" != "./$(DISTNAME)" ]; then \
@@ -159,7 +153,7 @@ distclean-top: clean-top
        $(RM) -r autom4te.cache
 
 realclean-top: distclean-top
-       $(RM) configure configure.bat
+       $(RM) configure
 
 clean-recursive distclean-recursive realclean-recursive:
        for subdir in $(SUBDIRS); do \

diff --git a/configure.bat b/configure.bat
new file mode 100644 (file)
index 0000000..7b41b8d
--- /dev/null
+++ b/configure.bat
@@ -0,0 +1,65 @@
+@echo off\r
+rem Configure batch file for `Wget' utility\r
+rem Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.\r
+\r
+rem This program is free software; you can redistribute it and/or modify\r
+rem it under the terms of the GNU General Public License as published by\r
+rem the Free Software Foundation; either version 2 of the License, or\r
+rem (at your option) any later version.\r
+\r
+rem This program is distributed in the hope that it will be useful,\r
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+rem GNU General Public License for more details.\r
+\r
+rem You should have received a copy of the GNU General Public License\r
+rem along with this program; if not, write to the Free Software\r
+rem Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\r
+\r
+rem In addition, as a special exception, the Free Software Foundation\r
+rem gives permission to link the code of its release of Wget with the\r
+rem OpenSSL project's "OpenSSL" library (or with modified versions of it\r
+rem that use the same license as the "OpenSSL" library), and distribute\r
+rem the linked executables.  You must obey the GNU General Public License\r
+rem in all respects for all of the code used other than "OpenSSL".  If you\r
+rem modify this file, you may extend this exception to your version of the\r
+rem file, but you are not obligated to do so.  If you do not wish to do\r
+rem so, delete this exception statement from your version.\r
+\r
+if .%1 == .--borland goto :borland\r
+if .%1 == .--mingw goto :mingw\r
+if .%1 == .--msvc goto :msvc\r
+goto :usage\r
+\r
+:msvc\r
+copy windows\config.h.ms src\config.h > nul\r
+copy windows\Makefile.top Makefile > nul\r
+copy windows\Makefile.src src\Makefile > nul\r
+copy windows\Makefile.doc doc\Makefile > nul\r
+\r
+echo Type NMAKE to start compiling.\r
+echo If it doesn't work, try executing MSDEV\BIN\VCVARS32.BAT first,\r
+echo and then NMAKE.\r
+goto :end\r
+\r
+:borland\r
+copy windows\config.h.bor src\config.h > nul\r
+copy windows\Makefile.top.bor Makefile > nul\r
+copy windows\Makefile.src.bor src\Makefile > nul\r
+copy windows\Makefile.doc doc\Makefile > nul\r
+\r
+echo Type MAKE to start compiling.\r
+goto :end\r
+\r
+:mingw\r
+copy windows\config.h.mingw src\config.h > nul\r
+copy windows\Makefile.top.mingw Makefile > nul\r
+copy windows\Makefile.src.mingw src\Makefile > nul\r
+copy windows\Makefile.doc doc\Makefile > nul\r
+\r
+echo Type mingw32-make to start compiling.\r
+goto :end\r
+\r
+:usage\r
+echo "Usage: configure [--borland | --mingw | --msvc]"\r
+:end\r

diff --git a/configure.bat.in b/configure.bat.in
deleted file mode 100644 (file)
index 4b59f40..0000000
--- a/configure.bat.in
+++ /dev/null
@@ -1,65 +0,0 @@
-@echo off
-rem Configure batch file for `Wget' utility
-rem Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-
-rem This program is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; either version 2 of the License, or
-rem (at your option) any later version.
-
-rem This program is distributed in the hope that it will be useful,
-rem but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
-
-rem You should have received a copy of the GNU General Public License
-rem along with this program; if not, write to the Free Software
-rem Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-rem In addition, as a special exception, the Free Software Foundation
-rem gives permission to link the code of its release of Wget with the
-rem OpenSSL project's "OpenSSL" library (or with modified versions of it
-rem that use the same license as the "OpenSSL" library), and distribute
-rem the linked executables.  You must obey the GNU General Public License
-rem in all respects for all of the code used other than "OpenSSL".  If you
-rem modify this file, you may extend this exception to your version of the
-rem file, but you are not obligated to do so.  If you do not wish to do
-rem so, delete this exception statement from your version.
-
-if .%1 == .--borland goto :borland
-if .%1 == .--mingw goto :mingw
-if .%1 == .--msvc goto :msvc
-goto :usage
-
-:msvc
-copy windows\config.h.ms src\config.h > nul
-copy windows\Makefile.top Makefile > nul
-copy windows\Makefile.src src\Makefile > nul
-copy windows\Makefile.doc doc\Makefile > nul
-
-echo Type NMAKE to start compiling.
-echo If it doesn't work, try executing MSDEV\BIN\VCVARS32.BAT first,
-echo and then NMAKE.
-goto :end
-
-:borland
-copy windows\config.h.bor src\config.h > nul
-copy windows\Makefile.top.bor Makefile > nul
-copy windows\Makefile.src.bor src\Makefile > nul
-copy windows\Makefile.doc doc\Makefile > nul
-
-echo Type MAKE to start compiling.
-goto :end
-
-:mingw
-copy windows\config.h.mingw src\config.h > nul
-copy windows\Makefile.top.mingw Makefile > nul
-copy windows\Makefile.src.mingw src\Makefile > nul
-copy windows\Makefile.doc doc\Makefile > nul
-
-echo Type mingw32-make to start compiling.
-goto :end
-
-:usage
-echo "Usage: configure [--borland | --mingw | --msvc]"
-:end