diff options
author | Miles Bader <miles@gnu.org> | 2007-08-21 04:54:03 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-08-21 04:54:03 +0000 |
commit | 42216a6b65dabb543156bc5e52cbf89d8ce96cb9 (patch) | |
tree | 1036c82a751bd2437cbc1b1d7f047bf3af679234 /nt | |
parent | eb5149ee586e6df9d919497688db0643c245386c (diff) | |
parent | bdaf8a62d53cf8d5a0dc4f0dc530ecd6fc1f44fe (diff) | |
download | emacs-42216a6b65dabb543156bc5e52cbf89d8ce96cb9.tar.gz |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 852-856)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 93-96)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 245)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-249
Diffstat (limited to 'nt')
-rw-r--r-- | nt/ChangeLog | 4 | ||||
-rw-r--r-- | nt/makefile.w32-in | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index deea04bff17..82771f836c6 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2007-08-14 Dhuvra Krishnamurthy <dhuvrakm@gmail.com> (tiny change) + + * makefile.w32-in (bootstrap-nmake): Change directories once more. + 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index e7a10698ea2..05e9a665879 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -153,6 +153,7 @@ bootstrap-nmake: addsection cmdproxy cd ..\src
$(MAKE) $(MFLAGS) bootstrap
$(MAKE) $(MFLAGS) bootstrap-clean
+ cd ..\nt
$(CP) $(BLD)/cmdproxy.exe ../bin
cd ..\lisp
$(MAKE) $(MFLAGS) SHELL=$(SHELLTYPE) bootstrap
|