Mercurial > hg > xemacs-beta

comparison nt/xemacs.mak @ 5929:f5dfcf2323bc cygwin

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vs2015_3.patch applied, and some vs64 fixes
author Henry Thompson <ht@markup.co.uk>
date Tue, 08 Dec 2015 09:05:19 +0000
parents 2f34b59f451a
children c1e8f3294298
comparison
equal deleted inserted replaced
5928:2f34b59f451a 5929:f5dfcf2323bc
484 EMACS_CONFIGURATION=mips-pc-win32 484 EMACS_CONFIGURATION=mips-pc-win32
485 !else if "$(PROCESSOR_ARCHITECTURE)" == "ALPHA" 485 !else if "$(PROCESSOR_ARCHITECTURE)" == "ALPHA"
486 EMACS_CONFIGURATION=alpha-pc-win32 486 EMACS_CONFIGURATION=alpha-pc-win32
487 !else if "$(PROCESSOR_ARCHITECTURE)" == "PPC" 487 !else if "$(PROCESSOR_ARCHITECTURE)" == "PPC"
488 EMACS_CONFIGURATION=ppc-pc-win32 488 EMACS_CONFIGURATION=ppc-pc-win32
489 !else if "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
490 EMACS_CONFIGURATION=i686-pc-win64
489 !else 491 !else
490 ! error Unknown processor architecture type $(PROCESSOR_ARCHITECTURE) 492 ! error Unknown processor architecture type $(PROCESSOR_ARCHITECTURE)
491 !endif 493 !endif
492 STACK_TRACE_EYE_CATCHER=$(XEMACS_VERSION_STRING:.=_) 494 STACK_TRACE_EYE_CATCHER=$(XEMACS_VERSION_STRING:.=_)
493 STACK_TRACE_EYE_CATCHER=xemacs_$(STACK_TRACE_EYE_CATCHER:-=_)_$(EMACS_CONFIGURATION:-=_) 495 STACK_TRACE_EYE_CATCHER=xemacs_$(STACK_TRACE_EYE_CATCHER:-=_)_$(EMACS_CONFIGURATION:-=_)
541 543
542 !if $(HAVE_XPM) 544 !if $(HAVE_XPM)
543 OPT_DEFINES=$(OPT_DEFINES) -DHAVE_XPM -DFOR_MSW 545 OPT_DEFINES=$(OPT_DEFINES) -DHAVE_XPM -DFOR_MSW
544 OPT_INCLUDES=$(OPT_INCLUDES) -I"$(XPM_DIR)" -I"$(XPM_DIR)\lib" 546 OPT_INCLUDES=$(OPT_INCLUDES) -I"$(XPM_DIR)" -I"$(XPM_DIR)\lib"
545 OPT_LIBS=$(OPT_LIBS) "$(XPM_DIR)\lib\Xpm.lib" 547 OPT_LIBS=$(OPT_LIBS) "$(XPM_DIR)\lib\Xpm.lib"
548 OPT_PATH=$(OPT_PATH)$(XPM_DIR)\lib;
546 !endif 549 !endif
547 !if $(HAVE_GIF) 550 !if $(HAVE_GIF)
548 OPT_DEFINES=$(OPT_DEFINES) -DHAVE_GIF 551 OPT_DEFINES=$(OPT_DEFINES) -DHAVE_GIF
549 OPT_INCLUDES=$(OPT_INCLUDES) -I"$(GIF_DIR)\include" 552 OPT_INCLUDES=$(OPT_INCLUDES) -I"$(GIF_DIR)\include"
550 OPT_LIBS=$(OPT_LIBS) "$(GIF_DIR)\lib\giflib.lib" 553 OPT_LIBS=$(OPT_LIBS) "$(GIF_DIR)\lib\giflib.lib"
593 !if $(HAVE_DATABASE) 596 !if $(HAVE_DATABASE)
594 OPT_DEFINES=$(OPT_DEFINES) -DHAVE_DATABASE -DHAVE_BERKELEY_DB -DDB_H_FILE=\"db.h\" 597 OPT_DEFINES=$(OPT_DEFINES) -DHAVE_DATABASE -DHAVE_BERKELEY_DB -DDB_H_FILE=\"db.h\"
595 OPT_INCLUDES=$(OPT_INCLUDES) -I"$(DATABASE_DIR)\build_win32" 598 OPT_INCLUDES=$(OPT_INCLUDES) -I"$(DATABASE_DIR)\build_win32"
596 !if $(BUILD_DATABASE_SHARED) 599 !if $(BUILD_DATABASE_SHARED)
597 OPT_LIBS=$(OPT_LIBS) "$(DATABASE_DIR)\build_win32\Release\libdb43.lib" 600 OPT_LIBS=$(OPT_LIBS) "$(DATABASE_DIR)\build_win32\Release\libdb43.lib"
601 OPT_PATH=$(OPT_PATH)$(DATABASE_DIR)\build_win32\Release;
598 !else 602 !else
599 OPT_LIBS=$(OPT_LIBS) "$(DATABASE_DIR)\build_win32\Release_static\libdb43s.lib" 603 OPT_LIBS=$(OPT_LIBS) "$(DATABASE_DIR)\build_win32\Release_static\libdb43s.lib"
604 OPT_PATH=$(OPT_PATH)$(DATABASE_DIR)\build_win32\Release_static;
600 !endif 605 !endif
601 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\database.obj 606 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\database.obj
602 !endif 607 !endif
603 !if $(HAVE_POSTGRESQL) 608 !if $(HAVE_POSTGRESQL)
604 OPT_DEFINES=$(OPT_DEFINES) -DHAVE_POSTGRESQL -DHAVE_POSTGRESQLV7 -DLIBPQ_FE_H_FILE=\"libpq-fe.h\" 609 OPT_DEFINES=$(OPT_DEFINES) -DHAVE_POSTGRESQL -DHAVE_POSTGRESQLV7 -DLIBPQ_FE_H_FILE=\"libpq-fe.h\"
736 !endif 741 !endif
737 742
738 !if $(USE_CRTDLL) 743 !if $(USE_CRTDLL)
739 ! if $(DEBUG_XEMACS) && "$(OK_TO_USE_MSVCRTD)" == "1" 744 ! if $(DEBUG_XEMACS) && "$(OK_TO_USE_MSVCRTD)" == "1"
740 C_LIBFLAG=-MDd 745 C_LIBFLAG=-MDd
741 LIBC_LIB=msvcrtd.lib 746 LIBC_LIB=msvcrtd.lib ucrtd.lib vcruntimed.lib
742 ! else 747 ! else
743 C_LIBFLAG=-MD 748 C_LIBFLAG=-MD
744 LIBC_LIB=msvcrt.lib 749 LIBC_LIB=msvcrt.lib ucrt.lib vcruntime.lib
745 ! endif 750 ! endif
746 !else 751 !else
747 C_LIBFLAG=-ML 752 C_LIBFLAG=-ML
748 LIBC_LIB=libc.lib 753 LIBC_LIB=libc.lib
749 !endif 754 !endif
791 ########################### Determine generic includes/defines/flags. 796 ########################### Determine generic includes/defines/flags.
792 797
793 INCLUDES=-I$(NT)\inc -I$(SRC) $(OPT_INCLUDES) 798 INCLUDES=-I$(NT)\inc -I$(SRC) $(OPT_INCLUDES)
794 799
795 DEFINES=$(OPT_DEFINES) \ 800 DEFINES=$(OPT_DEFINES) \
796 -DWIN32_LEAN_AND_MEAN -DWIN32_NATIVE -Demacs -DNTDDI_VERSION=NTDDI_WIN2K -D_WIN32_WINNT=_WIN32_WINNT_WIN2K \ 801 -DWIN32_LEAN_AND_MEAN -DWIN32_NATIVE -Demacs -DNTDDI_VERSION=NTDDI_WIN2K -D_WIN32_WINNT=_WIN32_WINNT_WIN2K -D_CRT_NO_POSIX_ERROR_CODES \
797 -DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES) 802 -DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES)
798 803
799 CFLAGS_NO_OPT=-nologo -W3 -DSTRICT $(DEBUG_FLAGS_COMPILE) 804 CFLAGS_NO_OPT=-nologo -W3 -DSTRICT $(DEBUG_FLAGS_COMPILE)
800 805
801 CFLAGS_NO_LIB=$(CFLAGS_NO_OPT) $(OPTFLAGS) 806 CFLAGS_NO_LIB=$(CFLAGS_NO_OPT) $(OPTFLAGS)
1101 {$(LIB_SRC)}.c{$(BLDLIB_SRC)}.exe : 1106 {$(LIB_SRC)}.c{$(BLDLIB_SRC)}.exe :
1102 $(CCV) $(LIB_SRC_CFLAGS) $(LINK_DEPENDENCY_ARGS) $(LINK_STANDARD_LIBRARY_ARGS) 1107 $(CCV) $(LIB_SRC_CFLAGS) $(LINK_DEPENDENCY_ARGS) $(LINK_STANDARD_LIBRARY_ARGS)
1103 # If we're using Visual Studio 2005 or greater, 1108 # If we're using Visual Studio 2005 or greater,
1104 # embed the manifest into the executable. 1109 # embed the manifest into the executable.
1105 !if $(MSC_VER) >= 1400 1110 !if $(MSC_VER) >= 1400
1106 mt -manifest $@.manifest -outputresource:$@;1 1111 @if exist $@.manifest mt -manifest $@.manifest -outputresource:$@;1
1107 !endif 1112 !endif
1108 1113
1109 # Individual dependencies 1114 # Individual dependencies
1110 ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(SRC)/regex.c 1115 ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(SRC)/regex.c
1111 $(BLDLIB_SRC)/etags.exe : $(LIB_SRC)/etags.c $(ETAGS_DEPS) 1116 $(BLDLIB_SRC)/etags.exe : $(LIB_SRC)/etags.c $(ETAGS_DEPS)
1112 $(CCV) $(LIB_SRC_CFLAGS) $(LINK_DEPENDENCY_ARGS) -stack:0x800000 $(LINK_STANDARD_LIBRARY_ARGS) 1117 $(CCV) $(LIB_SRC_CFLAGS) $(LINK_DEPENDENCY_ARGS) -stack:0x800000 $(LINK_STANDARD_LIBRARY_ARGS)
1113 # If we're using Visual Studio 2005 or greater, 1118 # If we're using Visual Studio 2005 or greater,
1114 # embed the manifest into the executable. 1119 # embed the manifest into the executable.
1115 !if $(MSC_VER) >= 1400 1120 !if $(MSC_VER) >= 1400
1116 mt -manifest $@.manifest -outputresource:$@;1 1121 @if exist $@.manifest mt -manifest $@.manifest -outputresource:$@;1
1117 !endif 1122 !endif
1118 1123
1119 $(BLDLIB_SRC)/movemail.exe : $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS) 1124 $(BLDLIB_SRC)/movemail.exe : $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS)
1120 1125
1121 # Minitar uses zlib so just use cdecl to simplify things 1126 # Minitar uses zlib so just use cdecl to simplify things
1122 $(BLDLIB_SRC)/minitar.exe : $(NT)/minitar.c 1127 $(BLDLIB_SRC)/minitar.exe : $(NT)/minitar.c
1123 $(CCV) -I$(SRC) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) $(CFLAGS_CDECL_NO_LIB) -MD $(LINK_DEPENDENCY_ARGS) "$(ZLIB_DIR)\zlib.lib" 1128 $(CCV) -I$(SRC) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) $(CFLAGS_CDECL_NO_LIB) -MD $(LINK_DEPENDENCY_ARGS) "$(ZLIB_DIR)\zlib.lib"
1124 # If we're using Visual Studio 2005 or greater, 1129 # If we're using Visual Studio 2005 or greater,
1125 # embed the manifest into the executable. 1130 # embed the manifest into the executable.
1126 !if $(MSC_VER) >= 1400 1131 !if $(MSC_VER) >= 1400
1127 mt -manifest $@.manifest -outputresource:$@;1 1132 @if exist $@.manifest mt -manifest $@.manifest -outputresource:$@;1
1128 !endif 1133 !endif
1129 1134
1130 LIB_SRC_TOOLS = \ 1135 LIB_SRC_TOOLS = \
1131 $(BLDLIB_SRC)/etags.exe \ 1136 $(BLDLIB_SRC)/etags.exe \
1132 $(BLDLIB_SRC)/hexl.exe \ 1137 $(BLDLIB_SRC)/hexl.exe \
1322 oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \ 1327 oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \
1323 shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \ 1328 shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \
1324 mpr.lib uuid.lib imm32.lib $(INTEL_LIBS) $(LIBC_LIB) 1329 mpr.lib uuid.lib imm32.lib $(INTEL_LIBS) $(LIBC_LIB)
1325 TEMACS_COMMON_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \ 1330 TEMACS_COMMON_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \
1326 -base:0x1000000 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows \ 1331 -base:0x1000000 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows \
1327 -heap:0x00100000 -nodefaultlib $(PROFILE_FLAGS) setargv.obj 1332 -heap:0x00100000 -nodefaultlib -dynamicbase:no $(PROFILE_FLAGS) setargv.obj
1328 TEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \ 1333 TEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \
1329 -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map 1334 -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map
1330 XEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \ 1335 XEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \
1331 -pdb:$(BLDSRC)\xemacs.pdb -map:$(BLDSRC)\xemacs.map 1336 -pdb:$(BLDSRC)\xemacs.pdb -map:$(BLDSRC)\xemacs.map
1332 1337
1333 ########################### Definitions for running temacs.exe/xemacs.exe 1338 ########################### Definitions for running temacs.exe/xemacs.exe
1334 1339
1335 RAW_EXE=$(BLDSRC)\temacs.exe 1340 RAW_EXE=$(BLDSRC)\temacs.exe
1336 DUMP_TARGET = $(BLDSRC)\xemacs.exe 1341 DUMP_TARGET = $(BLDSRC)\xemacs.exe
1337 DO_TEMACS = "$(BLDLIB_SRC)\i" "$(RAW_EXE)" 1342 #DO_TEMACS = "$(BLDLIB_SRC)\i" "$(RAW_EXE)" removed by HST, i.exe crashes
1338 DO_XEMACS = "$(BLDLIB_SRC)\i" "$(DUMP_TARGET)" 1343 DO_TEMACS = "$(RAW_EXE)"
1344 #DO_XEMACS = "$(BLDLIB_SRC)\i" "$(DUMP_TARGET)" ditto
1345 DO_XEMACS = "$(DUMP_TARGET)"
1339 1346
1340 BATCH = -no-packages -batch 1347 BATCH = -no-packages -batch
1341 BATCH_PACKAGES = -vanilla -batch 1348 BATCH_PACKAGES = -vanilla -batch
1342 TEMACS_BATCH = $(DO_TEMACS) -nd $(BATCH) 1349 TEMACS_BATCH = $(DO_TEMACS) -nd $(BATCH)
1343 XEMACS_BATCH = $(DO_XEMACS) $(BATCH) 1350 XEMACS_BATCH = $(DO_XEMACS) $(BATCH)
1395 !endif 1402 !endif
1396 1403
1397 ## (3) Update the .elc's needed for dumping 1404 ## (3) Update the .elc's needed for dumping
1398 1405
1399 update-elc: $(RAW_EXE) 1406 update-elc: $(RAW_EXE)
1407 set PATH=$(OPT_PATH)$(PATH)
1400 $(TEMACS_BATCH) -l $(LISP)\update-elc.el 1408 $(TEMACS_BATCH) -l $(LISP)\update-elc.el
1401 1409
1402 ## This file is touched by update-elc.el when redumping is necessary. 1410 ## This file is touched by update-elc.el when redumping is necessary.
1403 $(BLDSRC)\NEEDTODUMP: 1411 $(BLDSRC)\NEEDTODUMP:
1404 @echo >$(BLDSRC)\NEEDTODUMP 1412 @echo >$(BLDSRC)\NEEDTODUMP
1415 # dependencies for DOC) because DOC needs TEMACS_DOC_SOURCES as dependencies to 1423 # dependencies for DOC) because DOC needs TEMACS_DOC_SOURCES as dependencies to
1416 # get $(**) right. The `touch' is needed because of the way nmake 1424 # get $(**) right. The `touch' is needed because of the way nmake
1417 # calculates dependencies; see comments in src/Makefile.in.in. 1425 # calculates dependencies; see comments in src/Makefile.in.in.
1418 $(DOC): $(BLDLIB_SRC)\make-docfile.exe $(BLDSRC)\NEEDTODUMP $(TEMACS_DOC_SOURCES) 1426 $(DOC): $(BLDLIB_SRC)\make-docfile.exe $(BLDSRC)\NEEDTODUMP $(TEMACS_DOC_SOURCES)
1419 !if $(QUICK_BUILD) 1427 !if $(QUICK_BUILD)
1420 if not exist $(DOC) $(TEMACS_BATCH) -l $(LISP)\make-docfile.el -- -o $(DOC) -i $(SRCROOT)\site-packages @<< 1428 if not exist $(DOC) (
1429 set PATH=$(OPT_PATH)$(PATH)
1430 $(TEMACS_BATCH) -l $(LISP)\make-docfile.el -- -o $(DOC) -i $(SRCROOT)\site-packages @<<
1421 $(**) 1431 $(**)
1422 << 1432 <<
1423 -touch $(DOC) 1433 -touch $(DOC)
1424 !else 1434 )
1435 !else
1436 set PATH=$(OPT_PATH)$(PATH)
1425 $(TEMACS_BATCH) -l $(LISP)\make-docfile.el -- -o $(DOC) -i $(SRCROOT)\site-packages @<< 1437 $(TEMACS_BATCH) -l $(LISP)\make-docfile.el -- -o $(DOC) -i $(SRCROOT)\site-packages @<<
1426 $(**) 1438 $(**)
1427 << 1439 <<
1428 !endif 1440 !endif
1429 1441
1435 1447
1436 # This rule dumps xemacs and then possibly spawns sub-make if PURESPACE 1448 # This rule dumps xemacs and then possibly spawns sub-make if PURESPACE
1437 # requirements have changed. 1449 # requirements have changed.
1438 1450
1439 $(DUMP_TARGET): $(DOC) $(RAW_EXE) $(BLDSRC)\NEEDTODUMP 1451 $(DUMP_TARGET): $(DOC) $(RAW_EXE) $(BLDSRC)\NEEDTODUMP
1452 set PATH=$(OPT_PATH)$(PATH)
1440 $(TEMACS_BATCH) -l $(LISP)\loadup.el dump 1453 $(TEMACS_BATCH) -l $(LISP)\loadup.el dump
1441 !if $(USE_PORTABLE_DUMPER) 1454 !if $(USE_PORTABLE_DUMPER)
1442 cd $(BLDSRC) 1455 cd $(BLDSRC)
1443 rc -d INCLUDE_DUMP -Fo $(OUTDIR)\xemacs.res $(NT)\xemacs.rc 1456 rc -d INCLUDE_DUMP -Fo $(OUTDIR)\xemacs.res $(NT)\xemacs.rc
1444 # Make the resource section read/write since almost all of it is the dump 1457 # Make the resource section read/write since almost all of it is the dump
1448 << 1461 <<
1449 -$(DEL) $(BLDSRC)\xemacs.dmp 1462 -$(DEL) $(BLDSRC)\xemacs.dmp
1450 # If we're using Visual Studio 2005 or greater, 1463 # If we're using Visual Studio 2005 or greater,
1451 # embed the manifest into the executable. 1464 # embed the manifest into the executable.
1452 !if $(MSC_VER) >= 1400 1465 !if $(MSC_VER) >= 1400
1453 mt -manifest $@.manifest -outputresource:$@;1 1466 @if exist $@.manifest mt -manifest $@.manifest -outputresource:$@;1
1454 !endif 1467 !endif
1455 1468
1456 !endif 1469 !endif
1457 1470
1458 ## (6) Update the remaining .elc's, post-dumping 1471 ## (6) Update the remaining .elc's, post-dumping
1459 1472
1460 update-elc-2: $(DUMP_TARGET) 1473 update-elc-2: $(DUMP_TARGET)
1474 set PATH=$(OPT_PATH)$(PATH)
1461 $(XEMACS_BATCH) -no-autoloads -l update-elc-2.el -f batch-update-elc-2 $(LISP) 1475 $(XEMACS_BATCH) -no-autoloads -l update-elc-2.el -f batch-update-elc-2 $(LISP)
1462 1476
1463 ## (7) Other random stuff 1477 ## (7) Other random stuff
1464 1478
1465 $(LISP)/finder-inf.el: update-elc-2 1479 $(LISP)/finder-inf.el: update-elc-2
1466 !if !$(QUICK_BUILD) 1480 !if !$(QUICK_BUILD)
1467 @echo Building finder database ... 1481 @echo Building finder database ...
1482 set PATH=$(OPT_PATH)$(PATH)
1468 $(XEMACS_BATCH) -eval "(setq finder-compile-keywords-quiet t)" \ 1483 $(XEMACS_BATCH) -eval "(setq finder-compile-keywords-quiet t)" \
1469 -l finder -f finder-compile-keywords 1484 -l finder -f finder-compile-keywords
1470 @echo Building finder database ...(done) 1485 @echo Building finder database ...(done)
1471 !endif 1486 !endif
1472 1487
1473 load-shadows: update-elc-2 1488 load-shadows: update-elc-2
1474 !if !$(QUICK_BUILD) 1489 !if !$(QUICK_BUILD)
1475 @echo Testing for Lisp shadows ... 1490 @echo Testing for Lisp shadows ...
1491 set PATH=$(OPT_PATH)$(PATH)
1476 @$(XEMACS_BATCH) -f list-load-path-shadows 1492 @$(XEMACS_BATCH) -f list-load-path-shadows
1477 !endif 1493 !endif
1478 1494
1479 ###################### Building the info files 1495 ###################### Building the info files
1480 1496
1499 $(INFODIR)\xemacs-faq.info \ 1515 $(INFODIR)\xemacs-faq.info \
1500 $(INFODIR)\xemacs.info 1516 $(INFODIR)\xemacs.info
1501 1517
1502 {$(MANDIR)}.texi{$(INFODIR)}.info: 1518 {$(MANDIR)}.texi{$(INFODIR)}.info:
1503 cd $(MANDIR) 1519 cd $(MANDIR)
1520 set PATH=$(OPT_PATH)$(PATH)
1504 $(MAKEINFO) $(**F) 1521 $(MAKEINFO) $(**F)
1505 1522
1506 XEMACS_SRCS = \ 1523 XEMACS_SRCS = \
1507 $(MANDIR)\xemacs\abbrevs.texi \ 1524 $(MANDIR)\xemacs\abbrevs.texi \
1508 $(MANDIR)\xemacs\basic.texi \ 1525 $(MANDIR)\xemacs\basic.texi \
1631 $(MANDIR)\new-users-guide\search.texi \ 1648 $(MANDIR)\new-users-guide\search.texi \
1632 $(MANDIR)\new-users-guide\xmenu.texi 1649 $(MANDIR)\new-users-guide\xmenu.texi
1633 1650
1634 $(INFODIR)\xemacs.info: $(XEMACS_SRCS) 1651 $(INFODIR)\xemacs.info: $(XEMACS_SRCS)
1635 cd $(MANDIR)\xemacs 1652 cd $(MANDIR)\xemacs
1653 set PATH=$(OPT_PATH)$(PATH)
1636 $(MAKEINFO) xemacs.texi 1654 $(MAKEINFO) xemacs.texi
1637 1655
1638 $(INFODIR)\lispref.info: $(LISPREF_SRCS) 1656 $(INFODIR)\lispref.info: $(LISPREF_SRCS)
1639 cd $(MANDIR)\lispref 1657 cd $(MANDIR)\lispref
1658 set PATH=$(OPT_PATH)$(PATH)
1640 $(MAKEINFO) lispref.texi 1659 $(MAKEINFO) lispref.texi
1641 1660
1642 $(INFODIR)\internals.info: $(INTERNALS_SRCS) 1661 $(INFODIR)\internals.info: $(INTERNALS_SRCS)
1643 cd $(MANDIR)\internals 1662 cd $(MANDIR)\internals
1663 set PATH=$(OPT_PATH)$(PATH)
1644 $(MAKEINFO) internals.texi 1664 $(MAKEINFO) internals.texi
1645 1665
1646 $(INFODIR)\new-users-guide.info: $(NEW_USERS_GUIDE_SRCS) 1666 $(INFODIR)\new-users-guide.info: $(NEW_USERS_GUIDE_SRCS)
1647 cd $(MANDIR)\new-users-guide 1667 cd $(MANDIR)\new-users-guide
1668 set PATH=$(OPT_PATH)$(PATH)
1648 $(MAKEINFO) new-users-guide.texi 1669 $(MAKEINFO) new-users-guide.texi
1649 1670
1650 info: makeinfo-test $(INFO_FILES) 1671 info: makeinfo-test $(INFO_FILES)
1651 1672
1652 ######################################################################### 1673 #########################################################################
1658 testdir = ../tests/automated 1679 testdir = ../tests/automated
1659 batch_test_emacs = $(BATCH_PACKAGES) -l test-harness -f batch-test-emacs $(testdir) 1680 batch_test_emacs = $(BATCH_PACKAGES) -l test-harness -f batch-test-emacs $(testdir)
1660 1681
1661 check: 1682 check:
1662 cd $(BLDSRC) 1683 cd $(BLDSRC)
1684 set PATH=$(OPT_PATH)$(PATH)
1663 $(DO_XEMACS) $(batch_test_emacs) 1685 $(DO_XEMACS) $(batch_test_emacs)
1664 1686
1665 check-temacs: 1687 check-temacs:
1666 cd $(BLDSRC) 1688 cd $(BLDSRC)
1689 set PATH=$(OPT_PATH)$(PATH)
1667 $(TEMACS_BATCH) $(run_temacs_args) $(batch_test_emacs) 1690 $(TEMACS_BATCH) $(run_temacs_args) $(batch_test_emacs)
1668 1691
1669 check-features: all 1692 check-features: all
1670 cd $(BLDSRC) 1693 cd $(BLDSRC)
1694 set PATH=$(OPT_PATH)$(PATH)
1671 $(XEMACS_BATCH) -l check-features.el 1695 $(XEMACS_BATCH) -l check-features.el
1672 1696
1673 1697
1674 ########################### Rebuilding TAGS 1698 ########################### Rebuilding TAGS
1675 1699
1830 makeinfo-test: $(DUMP_TARGET) 1854 makeinfo-test: $(DUMP_TARGET)
1831 @<<makeinfo_test.bat 1855 @<<makeinfo_test.bat
1832 @echo off 1856 @echo off
1833 @"$(MAKEINFO)" --version 1857 @"$(MAKEINFO)" --version
1834 @if not errorlevel 1 goto test_done 1858 @if not errorlevel 1 goto test_done
1859 @set PATH=$(OPT_PATH)$(PATH)
1835 @$(XEMACS_BATCH_PACKAGES) -eval "(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))" 1860 @$(XEMACS_BATCH_PACKAGES) -eval "(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))"
1836 @if not errorlevel 1 goto suggest_makeinfo 1861 @if not errorlevel 1 goto suggest_makeinfo
1837 @echo XEmacs 'info' cannot be built! 1862 @echo XEmacs 'info' cannot be built!
1838 @echo Install XEmacs package 'texinfo' (see README.packages). 1863 @echo Install XEmacs package 'texinfo' (see README.packages).
1839 :suggest_makeinfo 1864 :suggest_makeinfo