3 files changed, 20 insertions, 1 deletions

diff --git a/nt/Makefile.in b/nt/Makefile.in
index 0f7b3463d42..7085a5c0595 100644
--- a/nt/Makefile.in
+++ b/nt/Makefile.in
@@ -195,7 +195,7 @@ TAGS: ${EXE_FILES:${EXEEXT}=.c}
 addsection${EXEEXT}: ${srcdir}/addsection.c
         $(CC) ${ALL_CFLAGS} ${srcdir}/addsection.c -o addsection${EXEEXT}
 
-addpm${EXEEXT}: ${srcdir}/addpm.c
+addpm${EXEEXT}: ${srcdir}/addpm.c ${srcdir}/../src/epaths.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/addpm.c $(LIBS_ADDPM) -o addpm${EXEEXT}
 
 ddeclient${EXEEXT}: ${srcdir}/ddeclient.c
diff --git a/nt/addpm.c b/nt/addpm.c
index 688e0167334..48c77821c8c 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -50,6 +50,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <shlobj.h>
 #include <ddeml.h>
 
+#ifndef OLD_PATHS
+#include "../src/epaths.h"
+#endif
+
 HDDEDATA CALLBACK
 DdeCallback (UINT uType, UINT uFmt, HCONV hconv,
              HSZ hsz1, HSZ hsz2, HDDEDATA hdata,
@@ -76,6 +80,7 @@ static struct entry
 }
 env_vars[] =
 {
+#ifdef OLD_PATHS
   {"emacs_dir", NULL},
   {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp;%emacs_dir%/leim"},
   {"SHELL", "%emacs_dir%/bin/cmdproxy.exe"},
@@ -86,6 +91,18 @@ env_vars[] =
   /*  {"INFOPATH", "%emacs_dir%/info"},  */
   {"EMACSDOC", "%emacs_dir%/etc"},
   {"TERM", "cmd"}
+#else  /* !OLD_PATHS */
+  {"emacs_dir", NULL},
+  {"EMACSLOADPATH", PATH_SITELOADSEARCH ";" PATH_LOADSEARCH},
+  {"SHELL", PATH_EXEC "/cmdproxy.exe"},
+  {"EMACSDATA", PATH_DATA},
+  {"EMACSPATH", PATH_EXEC},
+  /* We no longer set INFOPATH because Info-default-directory-list
+     is then ignored.  */
+  /*  {"INFOPATH", "%emacs_dir%/info"},  */
+  {"EMACSDOC", PATH_DOC},
+  {"TERM", "cmd"}
+#endif
 };
 
 BOOL
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index d3e1c8e2228..0c2f6324188 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -29,6 +29,8 @@ TMP_DIST_DIR 	= emacs-$(VERSION)
 TRES            = $(BLD)/emacs.res
 CLIENTRES       = $(BLD)/emacsclient.res
 
+LOCAL_FLAGS     = -DOLD_PATHS=1
+
 XMFLAGS         =
 
 ALL             = $(BLD)/addpm.exe $(BLD)/ddeclient.exe $(BLD)/runemacs.exe \