summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-04-13 18:46:06 -0700
committerGlenn Morris <rgm@gnu.org>2012-04-13 18:46:06 -0700
commit35dc09a19c606f9e7a078df32d030451c7c90ba1 (patch)
tree8df2ade99ad8620568094d61bba9dd4ac8856c43 /nt
parent327732d994c98849c765659aa2164a7482b6beab (diff)
parentad3a2b411dc2b34f5d6fa434aee3ca56fa7a88e7 (diff)
downloademacs-35dc09a19c606f9e7a078df32d030451c7c90ba1.tar.gz
Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/makefile.w32-in4
2 files changed, 6 insertions, 2 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index c7b94e64083..323e00bbd5f 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-14 Dani Moncayo <dmoncayo@gmail.com> (tiny change)
+
+ * makefile.w32-in: Fix typo (Bug#10261).
+
2012-04-10 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (emacs, misc, lispref, lispintro): New targets,
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index fcf57e8046d..3ddf3a04cb6 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -264,10 +264,10 @@ install-shortcuts: $(INSTALL_DIR)/bin
maybe-copy-distfiles: maybe-copy-distfiles-$(SHELLTYPE)
maybe-copy-distfiles-CMD: create-tmp-dist-dir doit
- @if not $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin
+ @if not $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE) == "" $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin
maybe-copy-distfiles-SH: create-tmp-dist-dir doit
- @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" ] ; then \
+ @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE) == "" ] ; then \
$(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin ; \
fi