comparison nt/xemacs.mak @ 496:98145293255c

[xemacs-hg @ 2001-05-01 12:05:20 by adrian] [PATCH] Bring emacs_beta_version handing in xemacs.mak closer to configure.in <pudtb8q5.fsf@rapier.ecf.teradyne.com>
author adrian
date Tue, 01 May 2001 12:05:20 +0000
parents 4137b1fb7b90
children cd662ad69f40
comparison
equal deleted inserted replaced
495:02f7a782086f 496:98145293255c
67 -DEMACS_VERSION=\"$(INFODOCK_VERSION_STRING)\" \ 67 -DEMACS_VERSION=\"$(INFODOCK_VERSION_STRING)\" \
68 -DINFODOCK_MAJOR_VERSION=$(infodock_major_version) \ 68 -DINFODOCK_MAJOR_VERSION=$(infodock_major_version) \
69 -DINFODOCK_MINOR_VERSION=$(infodock_minor_version) \ 69 -DINFODOCK_MINOR_VERSION=$(infodock_minor_version) \
70 -DINFODOCK_BUILD_VERSION=$(infodock_build_version) 70 -DINFODOCK_BUILD_VERSION=$(infodock_build_version)
71 !else 71 !else
72 XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version)
73 !if "$(emacs_beta_version)" != ""
72 !if "$(emacs_is_beta)" != "" 74 !if "$(emacs_is_beta)" != ""
73 XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version)-b$(emacs_beta_version) 75 XEMACS_VERSION_STRING=$(XEMACS_VERSION_STRING)-b$(emacs_beta_version)
74 !else 76 !else
75 XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version).$(emacs_beta_version) 77 XEMACS_VERSION_STRING=$(XEMACS_VERSION_STRING).$(emacs_beta_version)
78 !endif
76 !endif 79 !endif
77 PROGRAM_DEFINES= \ 80 PROGRAM_DEFINES= \
78 -DPATH_VERSION=\"$(XEMACS_VERSION_STRING)\" \ 81 -DPATH_VERSION=\"$(XEMACS_VERSION_STRING)\" \
79 -DPATH_PROGNAME=\"xemacs\" \ 82 -DPATH_PROGNAME=\"xemacs\" \
80 -DEMACS_VERSION=\"$(XEMACS_VERSION_STRING)\" \ 83 -DEMACS_VERSION=\"$(XEMACS_VERSION_STRING)\" \
827 830
828 # TEMACS Executable 831 # TEMACS Executable
829 832
830 # This may not exist 833 # This may not exist
831 !if "$(emacs_beta_version)" != "" 834 !if "$(emacs_beta_version)" != ""
835 !if "$(emacs_is_beta)" != ""
832 EMACS_BETA_VERSION=-DEMACS_BETA_VERSION=$(emacs_beta_version) 836 EMACS_BETA_VERSION=-DEMACS_BETA_VERSION=$(emacs_beta_version)
833 !ENDIF 837 !else
838 EMACS_PATCH_LEVEL=-DEMACS_PATCH_LEVEL=$(emacs_beta_version)
839 !endif
840 !endif
834 841
835 !if !$(USE_PORTABLE_DUMPER) 842 !if !$(USE_PORTABLE_DUMPER)
836 TEMACS_ENTRYPOINT=-entry:_start 843 TEMACS_ENTRYPOINT=-entry:_start
837 !else 844 !else
838 TEMACS_ENTRYPOINT=-entry:mainCRTStartup 845 TEMACS_ENTRYPOINT=-entry:mainCRTStartup
1336 1343
1337 LOADPATH=$(LISP) 1344 LOADPATH=$(LISP)
1338 1345
1339 # Rebuild docfile target 1346 # Rebuild docfile target
1340 docfile :: 1347 docfile ::
1341 if exist $(DOC) $(DEL) $(DOC) 1348 if exist $(DOC) del $(DOC)
1342 docfile :: $(DOC) 1349 docfile :: $(DOC)
1343 1350
1344 $(DOC): $(LIB_SRC)\make-docfile.exe $(DOC_SRC1) $(DOC_SRC2) $(DOC_SRC3) $(DOC_SRC4) $(DOC_SRC5) $(DOC_SRC6) $(DOC_SRC7) $(DOC_SRC8) $(DOC_SRC9) $(DOC_SRC10) $(DOC_SRC11) 1351 $(DOC): $(LIB_SRC)\make-docfile.exe $(DOC_SRC1) $(DOC_SRC2) $(DOC_SRC3) $(DOC_SRC4) $(DOC_SRC5) $(DOC_SRC6) $(DOC_SRC7) $(DOC_SRC8) $(DOC_SRC9) $(DOC_SRC10) $(DOC_SRC11)
1345 if exist $(DOC) del $(DOC) 1352 if exist $(DOC) del $(DOC)
1346 set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH) 1353 set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)