# HG changeset patch
# User Christoph Scholtes <cschol2112@gmail.com>
# Date 1280009050 21600
# Node ID 17b112f1eaa5b470cc5d9e890410ae2dd807f5aa
# Parent  773951d3ff170e7534c29d6c8d4cc41f2a19b321
Code cleanup. Added ChangeLog entry.

diff -r 773951d3ff17 -r 17b112f1eaa5 nt/ChangeLog
--- a/nt/ChangeLog	Sat Jul 24 15:35:36 2010 -0600
+++ b/nt/ChangeLog	Sat Jul 24 16:04:10 2010 -0600
@@ -1,3 +1,9 @@
+2010-07-24  Christoph Scholtes  <cschol2112@gmail.com>
+
+	* makefile.w32-in: 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)
diff -r 773951d3ff17 -r 17b112f1eaa5 nt/makefile.w32-in
--- a/nt/makefile.w32-in	Sat Jul 24 15:35:36 2010 -0600
+++ b/nt/makefile.w32-in	Sat Jul 24 16:04:10 2010 -0600
@@ -251,17 +251,17 @@
 
 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) "$(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)
diff -r 773951d3ff17 -r 17b112f1eaa5 nt/zipdist.bat
--- a/nt/zipdist.bat	Sat Jul 24 15:35:36 2010 -0600
+++ b/nt/zipdist.bat	Sat Jul 24 16:04:10 2010 -0600
@@ -42,7 +42,7 @@
 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 %TMP_DIST_DIR%/README.W32 %TMP_DIST_DIR%/bin %TMP_DIST_DIR%/etc/DOC-X %TMP_DIST_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
 goto EXIT