Mercurial > hg > xemacs-beta

comparison nt/xemacs.mak @ 5927:b58b74274fa2 cygwin

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