From: Glenn Morris <rgm@gnu.org>
Date: Tue, 5 Nov 2013 08:13:09 +0000 (-0800)
Subject: * make-dist: Don't distribute old, unsupported w32 build method.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~966
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=da6a8debb270a2e602f3b789ec3e27e815041164;p=emacs.git

* make-dist: Don't distribute old, unsupported w32 build method.
---

diff --git a/ChangeLog b/ChangeLog
index eaf7d751afa..4df3cd31886 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2013-11-05  Glenn Morris  <rgm@gnu.org>
 
+	* make-dist: Don't distribute old, unsupported w32 build method.
+
 	* autogen: Remove directory.  Move update_autogen to admin/.
 	* autogen.sh: Remove reference to copy_autogen.
 	* GNUmakefile (configure):
diff --git a/make-dist b/make-dist
index 95e4984a6bd..be34e33e8c1 100755
--- a/make-dist
+++ b/make-dist
@@ -326,7 +326,7 @@ files=`find lisp \( -name '*.el' -o -name '*.elc' -o -name 'ChangeLog*' \
  -o -name 'README' \)`
 
 ### Don't distribute site-init.el, site-load.el, or default.el.
-for file in lisp/Makefile.in lisp/makefile.w32-in $files; do
+for file in lisp/Makefile.in $files; do
   case $file in
     */site-init*|*/site-load*|*/default*) continue ;;
   esac
@@ -335,7 +335,6 @@ done
 
 echo "Making links to \`leim' and its subdirectories"
 (cd leim
- ln makefile.w32-in ../${tempdir}/leim
  ln ChangeLog README ../${tempdir}/leim
  ln CXTERM-DIC/README CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC
  ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/leim/SKK-DIC
@@ -369,7 +368,6 @@ echo "Making links to \`src'"
  ln [a-zA-Z]*.in ../${tempdir}/src
  ln [a-zA-Z]*.mk ../${tempdir}/src
  ln README ChangeLog ChangeLog.*[0-9] ../${tempdir}/src
- ln makefile.w32-in ../${tempdir}/src
  ln .gdbinit .dbxinit ../${tempdir}/src
  cd ../${tempdir}/src
  rm -f globals.h config.h epaths.h Makefile buildobj.h)
@@ -382,7 +380,7 @@ echo "Making links to \`lib'"
 (snippet_h=`(cd build-aux/snippet && ls *.h)`
  cd lib
  ln [a-zA-Z]*.[ch] ../${tempdir}/lib
- ln gnulib.mk Makefile.am Makefile.in makefile.w32-in ../${tempdir}/lib
+ ln gnulib.mk Makefile.am Makefile.in ../${tempdir}/lib
  cd ../${tempdir}/lib
  script='/[*]/d; s/\.in\.h$/.h/'
  rm -f `(echo "$snippet_h"; ls *.in.h) | sed "$script"`)
@@ -391,8 +389,7 @@ echo "Making links to \`lib-src'"
 (cd lib-src
  ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src
  ln ChangeLog Makefile.in README testfile ../${tempdir}/lib-src
- ln grep-changelog rcs2log ../${tempdir}/lib-src
- ln makefile.w32-in ../${tempdir}/lib-src)
+ ln grep-changelog rcs2log ../${tempdir}/lib-src)
 
 echo "Making links to \`m4'"
 (cd m4
@@ -401,11 +398,12 @@ echo "Making links to \`m4'"
 echo "Making links to \`nt'"
 (cd nt
  ln emacs-x86.manifest emacs-x64.manifest emacs.rc ../${tempdir}/nt
- ln config.nt emacsclient.rc emacs-src.tags ../${tempdir}/nt
+ ln emacsclient.rc emacs-src.tags ../${tempdir}/nt
  ln nmake.defs gmake.defs subdirs.el [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt
+ rm -f ../${tempdir}/nt/configure.bat
  ln Makefile.in gnulib.mk ../${tempdir}/nt
- ln msysconfig.sh mingw-cfg.site epaths.nt INSTALL.OLD ../${tempdir}/nt
- ln ChangeLog INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt)
+ ln msysconfig.sh mingw-cfg.site epaths.nt ../${tempdir}/nt
+ ln ChangeLog INSTALL README README.W32 ../${tempdir}/nt)
 
 echo "Making links to \`nt/inc' and its subdirectories"
 for f in `find nt/inc -type f -name '[a-z]*.h'`; do
@@ -456,7 +454,7 @@ echo "Making links to \`lwlib'"
 echo "Making links to \`admin' and its subdirectories"
 for f in `find admin -type f`; do
   case $f in
-    admin/unidata/Makefile) continue ;;
+    admin/unidata/Makefile|admin/unidata/makefile.w32-in) continue ;;
   esac
   ln $f $tempdir/$f
 done
@@ -488,21 +486,21 @@ ln `find info -type f -print` ${tempdir}/info
 
 echo "Making links to \`doc/emacs'"
 (cd doc/emacs
- ln *.texi *.in makefile.w32-in ChangeLog* ../../${tempdir}/doc/emacs)
+ ln *.texi *.in ChangeLog* ../../${tempdir}/doc/emacs)
 
 echo "Making links to \`doc/misc'"
 (cd doc/misc
- ln *.texi *.tex *.in makefile.w32-in gnus-news.el ChangeLog* ../../${tempdir}/doc/misc)
+ ln *.texi *.tex *.in gnus-news.el ChangeLog* ../../${tempdir}/doc/misc)
 
 echo "Making links to \`doc/lispref'"
 (cd doc/lispref
- ln *.texi *.in makefile.w32-in README ChangeLog* ../../${tempdir}/doc/lispref
+ ln *.texi *.in README ChangeLog* ../../${tempdir}/doc/lispref
  ln spellfile ../../${tempdir}/doc/lispref
  ln two-volume.make two-volume-cross-refs.txt ../../${tempdir}/doc/lispref)
 
 echo "Making links to \`doc/lispintro'"
 (cd doc/lispintro
- ln *.texi *.in makefile.w32-in *.eps *.pdf ../../${tempdir}/doc/lispintro
+ ln *.texi *.in *.eps *.pdf ../../${tempdir}/doc/lispintro
  ln README ChangeLog* ../../${tempdir}/doc/lispintro
  cd ../../${tempdir}/doc/lispintro)