Revert most of the recent change involving manifests on Cygwin. (Bug#17176)

* configure.ac (EMACS_MANIFEST): Revert last change (but leave
UPDATE_MANIFEST empty).
* nt/emacs.rc: Revert last change.
* src/Makefile.in (EMACS_MANIFEST): Revert last change.

2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7618fb202e0..e2c925f03d3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-09  Ken Brown  <kbrown@cornell.edu>
+
+        * Makefile.in (EMACS_MANIFEST): Revert last change.
+
 2014-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * lisp.h (struct Lisp_Symbol): New bitfield `pinned'.
diff --git a/src/Makefile.in b/src/Makefile.in
index 7e71d030279..388923596c9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -259,7 +259,7 @@ W32_LIBS=@W32_LIBS@
 
 ## emacs.res if HAVE_W32
 EMACSRES = @EMACSRES@
-## emacs-*.manifest if WINDOWSNT
+## emacs-*.manifest if HAVE_W32
 EMACS_MANIFEST = @EMACS_MANIFEST@
 ## If HAVE_W32, compiler arguments for including
 ## the resource file in the binary.