Mercurial > hg > xemacs-beta
diff 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 |
line wrap: on
line diff
--- a/nt/xemacs.mak Tue May 01 09:36:44 2001 +0000 +++ b/nt/xemacs.mak Tue May 01 12:05:20 2001 +0000 @@ -69,10 +69,13 @@ -DINFODOCK_MINOR_VERSION=$(infodock_minor_version) \ -DINFODOCK_BUILD_VERSION=$(infodock_build_version) !else +XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version) +!if "$(emacs_beta_version)" != "" !if "$(emacs_is_beta)" != "" -XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version)-b$(emacs_beta_version) +XEMACS_VERSION_STRING=$(XEMACS_VERSION_STRING)-b$(emacs_beta_version) !else -XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version).$(emacs_beta_version) +XEMACS_VERSION_STRING=$(XEMACS_VERSION_STRING).$(emacs_beta_version) +!endif !endif PROGRAM_DEFINES= \ -DPATH_VERSION=\"$(XEMACS_VERSION_STRING)\" \ @@ -829,8 +832,12 @@ # This may not exist !if "$(emacs_beta_version)" != "" +!if "$(emacs_is_beta)" != "" EMACS_BETA_VERSION=-DEMACS_BETA_VERSION=$(emacs_beta_version) -!ENDIF +!else +EMACS_PATCH_LEVEL=-DEMACS_PATCH_LEVEL=$(emacs_beta_version) +!endif +!endif !if !$(USE_PORTABLE_DUMPER) TEMACS_ENTRYPOINT=-entry:_start @@ -1338,7 +1345,7 @@ # Rebuild docfile target docfile :: - if exist $(DOC) $(DEL) $(DOC) + if exist $(DOC) del $(DOC) docfile :: $(DOC) $(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)