5 files changed, 26 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 1252a7a15a4..c88303bb525 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * configure.ac: Define and substitute UPDATE_MANIFEST.
+
 2013-08-04  Stephen Berman  <stephen.berman@gmx.net>
 
         * info/dir: Add todo-mode.
diff --git a/configure.ac b/configure.ac
index 89aba556bb3..e4a846402f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1641,6 +1641,7 @@ CLIENTRES=
 CLIENTW=
 W32_RES_LINK=
 EMACS_MANIFEST=
+UPDATE_MANIFEST=
 if test "${with_w32}" != no; then
   case "${opsys}" in
     cygwin)
@@ -1691,6 +1692,7 @@ if test "${HAVE_W32}" = "yes"; then
     x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
     *) EMACS_MANIFEST="emacs-x86.manifest" ;;
   esac
+  UPDATE_MANIFEST=update-game-score.exe.manifest
   if test "${opsys}" = "cygwin"; then
     W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
     W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
@@ -1717,6 +1719,7 @@ AC_SUBST(W32_OBJ)
 AC_SUBST(W32_LIBS)
 AC_SUBST(EMACSRES)
 AC_SUBST(EMACS_MANIFEST)
+AC_SUBST(UPDATE_MANIFEST)
 AC_SUBST(CLIENTRES)
 AC_SUBST(CLIENTW)
 AC_SUBST(W32_RES_LINK)
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index da97246ef64..53d66ba1e37 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,10 @@
+2013-08-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * update-game-score.exe.manifest: New file.
+
+        * Makefile.in (UPDATE_MANIFEST): New variable.
+        (SCRIPTS): Add $(UPDATE_MANIFEST).
+
 2013-08-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * makefile.w32-in (lisp2): Add nadvice.elc.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 8285910cdbf..fe1900a2a40 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -40,6 +40,7 @@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@
 PROFILING_CFLAGS = @PROFILING_CFLAGS@
 WARN_CFLAGS = @WARN_CFLAGS@
 WERROR_CFLAGS = @WERROR_CFLAGS@
+UPDATE_MANIFEST = @UPDATE_MANIFEST@
 
 # Program name transformation.
 TRANSFORM = @program_transform_name@
@@ -132,7 +133,7 @@ DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
 
 # Like UTILITIES, but they're not system-dependent, and should not be
 #  deleted by the distclean target.
-SCRIPTS= rcs2log
+SCRIPTS= rcs2log $(UPDATE_MANIFEST)
 
 # All files that are created by the linker, i.e., whose names end in ${EXEEXT}.
 EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
diff --git a/lib-src/update-game-score.exe.manifest b/lib-src/update-game-score.exe.manifest
new file mode 100644
index 00000000000..1db836bec6b
--- /dev/null
+++ b/lib-src/update-game-score.exe.manifest
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

+  <v3:trustInfo xmlns:v3="urn:schemas-microsoft-com:asm.v3">

+    <v3:security>

+      <v3:requestedPrivileges>

+        <v3:requestedExecutionLevel level="asInvoker" />

+      </v3:requestedPrivileges>

+    </v3:security>

+  </v3:trustInfo>

+</assembly>