# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: cschol2112@gmail.com-20100725030715-zny18yz1rghje8er
# target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk/
# testament_sha1: c73940e4ed6fed5fb41a5bacb9e06ee0c37fa7ca
# timestamp: 2010-07-24 21:08:03 -0600
# base_revision_id: lekktu@gmail.com-20100724134348-x1dl00925oxq9svi
# 
# Begin patch
=== modified file 'nt/ChangeLog'
--- nt/ChangeLog	2010-07-24 13:35:31 +0000
+++ nt/ChangeLog	2010-07-25 03:07:15 +0000
@@ -1,5 +1,13 @@
 2010-07-24  Christoph Scholtes  <cschol2112@gmail.com>
 
+	* makefile.w32-in: Copy README.W32 to installation directory
+	during `make install'.  Remove README.W32 with `distclean' (in
+	case Emacs was installed in place).  Use temporary directory to
+	create distribution zip files in `dist' target.
+	* zipdist.bat: Simplify code using temporary directory.
+
+2010-07-24  Christoph Scholtes  <cschol2112@gmail.com>
+
 	New make target for Windows platform: make dist (bug#6602)
 
 	* INSTALL: Document new dist target and add section about

=== modified file 'nt/makefile.w32-in'
--- nt/makefile.w32-in	2010-07-24 13:35:31 +0000
+++ nt/makefile.w32-in	2010-07-25 03:07:15 +0000
@@ -25,6 +25,8 @@
 
 VERSION		= 24.0.50
 
+TMP_DIST_DIR 	= emacs-$(VERSION)
+
 TRES		= $(BLD)/emacs.res
 CLIENTRES	= $(BLD)/emacsclient.res
 
@@ -208,6 +210,7 @@
 	- $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin
 	- $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin
 	- $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin
+	- $(CP) README.W32 $(INSTALL_DIR)
 	- $(DEL) ../same-dir.tst
 	- $(DEL) $(INSTALL_DIR)/same-dir.tst
 	echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"
@@ -246,10 +249,22 @@
 install-shortcuts:
 	"$(INSTALL_DIR)/bin/addpm" -q
 
-dist: install-bin 
-	$(CP) $(DIST_FILES) $(INSTALL_DIR)/bin
-	$(CP) README.W32 $(INSTALL_DIR)
-	$(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(INSTALL_DIR) $(VERSION)$(ARGQUOTE)
+dist: install-bin
+	mkdir $(TMP_DIST_DIR)
+	$(CP) "$(INSTALL_DIR)/BUGS" $(TMP_DIST_DIR)
+	$(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR)
+	$(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR)
+	$(CP) "$(INSTALL_DIR)/README.W32" $(TMP_DIST_DIR)
+	$(CP) "$(INSTALL_DIR)/INSTALL" $(TMP_DIST_DIR)
+	$(CP_DIR) "$(INSTALL_DIR)/bin" $(TMP_DIST_DIR)
+	$(CP_DIR) "$(INSTALL_DIR)/etc" $(TMP_DIST_DIR)
+	$(CP_DIR) "$(INSTALL_DIR)/info" $(TMP_DIST_DIR)
+	$(CP_DIR) "$(INSTALL_DIR)/lisp" $(TMP_DIST_DIR)
+	$(CP_DIR) "$(INSTALL_DIR)/leim" $(TMP_DIST_DIR)
+	$(CP_DIR) "$(INSTALL_DIR)/site-lisp" $(TMP_DIST_DIR)
+	$(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin
+	$(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(VERSION)$(ARGQUOTE)
+	$(DEL_TREE) $(TMP_DIST_DIR)
 
 force-info:
 # Note that doc/emacs/makefile knows how to
@@ -336,6 +351,7 @@
 	- $(DEL) stamp_BLD
 	- $(DEL) ../etc/DOC ../etc/DOC-X
 	- $(DEL) config.log Makefile
+	- $(DEL) ../README.W32
 
 distclean: distclean-other-dirs-$(MAKETYPE) top-distclean
 

=== modified file 'nt/zipdist.bat'
--- nt/zipdist.bat	2010-07-24 13:35:31 +0000
+++ nt/zipdist.bat	2010-07-24 22:04:10 +0000
@@ -20,25 +20,10 @@
 rem along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.
 
 SETLOCAL
-rem arg 1: full path to Emacs root directory
-set ARG_PATH="%~f1"
-rem Path separator cannot be parsed correctly, substitute
-set ARG_PATH=%ARG_PATH:\=;%
-
-rem arg 2: Emacs version number
-set EMACS_VER=%2
-
-rem Parse out last directory from passed in full path (arg 1)
-for /f "tokens=* delims=;" %%G in (%ARG_PATH%) do call :PARSE_PATH %%G
-goto :EXIT
-
-:PARSE_PATH
-if "%1"=="" (
-  goto :ZIP_CHECK
-)
-set ROOT_DIR=%1
-SHIFT
-goto :PARSE_PATH
+rem arg 1: Emacs version number
+set EMACS_VER=%1
+
+set TMP_DIST_DIR=emacs-%EMACS_VER%
 
 rem Check, if 7zip is installed and available on path
 :ZIP_CHECK
@@ -53,14 +38,12 @@
 
 rem Build distributions
 :ZIP_DIST
-pushd ..\..
 rem Build and verify full distribution
-7z a -bd -tZIP -mx=9 -x!.bzrignore -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-bin-i386.zip %ROOT_DIR%/BUGS %ROOT_DIR%/COPYING %ROOT_DIR%/README %ROOT_DIR%/README.W32 %ROOT_DIR%/INSTALL %ROOT_DIR%/bin %ROOT_DIR%/etc %ROOT_DIR%/info %ROOT_DIR%/lisp %ROOT_DIR%/leim %ROOT_DIR%/site-lisp
+7z a -bd -tZIP -mx=9 -x!.bzrignore -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-bin-i386.zip %TMP_DIST_DIR%
 7z t emacs-%EMACS_VER%-bin-i386.zip
 rem Build and verify binary only distribution
-7z a -bd -tZIP -mx=9 emacs-%EMACS_VER%-barebin-i386.zip %ROOT_DIR%/README.W32 %ROOT_DIR%/bin %ROOT_DIR%/etc/DOC-X %ROOT_DIR%/COPYING
+7z a -bd -tZIP -mx=9 -x!.bzrignore -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-barebin-i386.zip %TMP_DIST_DIR%/README.W32 %TMP_DIST_DIR%/bin %TMP_DIST_DIR%/etc/DOC-X %TMP_DIST_DIR%/COPYING
 7z t emacs-%EMACS_VER%-barebin-i386.zip
-popd
 goto EXIT
 
 :EXIT

# Begin bundle
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
2kduYyikvCBehqDB+zvF3JFOFCQ32GrQQA==