aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Moncayo2012-02-23 02:52:08 -0500
committerStefan Monnier2012-02-23 02:52:08 -0500
commit2dbe4d71064b2010411c522620fbcfb216642f07 (patch)
tree5c2556a6888248ec02e295f8ebc1f040428267e5
parentf01d3321d5a7ca4147b675f02d5aa51dc65c2b55 (diff)
downloademacs-2dbe4d71064b2010411c522620fbcfb216642f07.tar.gz
emacs-2dbe4d71064b2010411c522620fbcfb216642f07.zip
* nt/makefile.w32-in (maybe-copy-distfiles-SH): Fix typo.
-rw-r--r--nt/ChangeLog35
-rw-r--r--nt/makefile.w32-in2
2 files changed, 20 insertions, 17 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 544b964be3d..919decfbc53 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
12012-02-23 Dani Moncayo <dmoncayo@gmail.com> (tiny change)
2
3 * makefile.w32-in (maybe-copy-distfiles-SH): Fix typo.
4
12012-02-06 Christoph Scholtes <cschol2112@googlemail.com> 52012-02-06 Christoph Scholtes <cschol2112@googlemail.com>
2 6
3 * README.W32: Removed specific version information for libXpm 7 * README.W32: Removed specific version information for libXpm
@@ -13,7 +17,7 @@
13 17
14 * makefile.w32-in (maybe-copy-distfiles) 18 * makefile.w32-in (maybe-copy-distfiles)
15 (maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH) 19 (maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH)
16 (create-tmp-dist-dir): Added to make --distfiles optional. 20 (create-tmp-dist-dir): Add to make --distfiles optional.
17 (dist): Use create-tmp-dist-dir and maybe-copy-distfiles. (Bug#10261) 21 (dist): Use create-tmp-dist-dir and maybe-copy-distfiles. (Bug#10261)
18 22
192012-02-04 Eli Zaretskii <eliz@gnu.org> 232012-02-04 Eli Zaretskii <eliz@gnu.org>
@@ -149,8 +153,8 @@
149 A new ESC_USER_CFLAGS variable is written to config.settings. 153 A new ESC_USER_CFLAGS variable is written to config.settings.
150 This variable has the same value as the escusercflags variable. 154 This variable has the same value as the escusercflags variable.
151 155
152 * gmake.defs, nmake.defs: Added the variable ESC_CFLAGS. This 156 * gmake.defs, nmake.defs: Added the variable ESC_CFLAGS.
153 variable is identical to the CFLAGS variable except that it 157 This variable is identical to the CFLAGS variable except that it
154 includes the new ESC_USER_CFLAGS variable instead of USER_CFLAGS. 158 includes the new ESC_USER_CFLAGS variable instead of USER_CFLAGS.
155 159
156 These changes, along with some changes to src/makefile.w32-in, 160 These changes, along with some changes to src/makefile.w32-in,
@@ -195,8 +199,7 @@
195 199
1962011-04-28 Eli Zaretskii <eliz@gnu.org> 2002011-04-28 Eli Zaretskii <eliz@gnu.org>
197 201
198 * gmake.defs (ARCH): Fix error message in case of unknown 202 * gmake.defs (ARCH): Fix error message in case of unknown architecture.
199 architecture.
200 203
2012011-04-27 Eli Zaretskii <eliz@gnu.org> 2042011-04-27 Eli Zaretskii <eliz@gnu.org>
202 205
@@ -227,8 +230,8 @@
227 230
228 * configure.bat: Modified the code that parses the --cflags and 231 * configure.bat: Modified the code that parses the --cflags and
229 --ldflags options to support parameters that include the = 232 --ldflags options to support parameters that include the =
230 character as long as they are enclosed in quotes. This 233 character as long as they are enclosed in quotes.
231 functionality depends on command extensions. Configure.bat now 234 This functionality depends on command extensions. Configure.bat now
232 attempts to enable command extensions and displays a warning 235 attempts to enable command extensions and displays a warning
233 message if they could not be enabled. If configure.bat could 236 message if they could not be enabled. If configure.bat could
234 not enable command extensions the old parsing code is used that 237 not enable command extensions the old parsing code is used that
@@ -756,8 +759,8 @@
756 Ignore return status. 759 Ignore return status.
757 760
758 * configure.bat (dontCopy): Rename admin/unidata/Makefile to keep 761 * configure.bat (dontCopy): Rename admin/unidata/Makefile to keep
759 it out of the way of Windows generated file. Generate 762 it out of the way of Windows generated file.
760 admin/unidata/makefile. 763 Generate admin/unidata/makefile.
761 764
762 * makefile.w32-in (unidatagen-nmake, unidatagen-clean-nmake) 765 * makefile.w32-in (unidatagen-nmake, unidatagen-clean-nmake)
763 (unidatagen-CMD, unidatagen-clean-CMD, unidatagen-SH) 766 (unidatagen-CMD, unidatagen-clean-CMD, unidatagen-SH)
@@ -956,8 +959,8 @@
956 959
957 * gmake.defs: Export XMFLAGS. 960 * gmake.defs: Export XMFLAGS.
958 961
959 * makefile.w32-in (all-other-dirs-nmake, recompile-nmake): Don't 962 * makefile.w32-in (all-other-dirs-nmake, recompile-nmake):
960 use $(XMFLAGS) for nmake, as it doesn't support parallelism. 963 Don't use $(XMFLAGS) for nmake, as it doesn't support parallelism.
961 964
9622006-12-22 Eli Zaretskii <eliz@gnu.org> 9652006-12-22 Eli Zaretskii <eliz@gnu.org>
963 966
@@ -1541,8 +1544,8 @@
1541 * README: Update info about compilers. 1544 * README: Update info about compilers.
1542 1545
1543 * makefile.w32-in: Use $(MAKETYPE) instead of $(SHELLTYPE) to 1546 * makefile.w32-in: Use $(MAKETYPE) instead of $(SHELLTYPE) to
1544 select correct rule for invoking make in another directory. Amend 1547 select correct rule for invoking make in another directory.
1545 rules accordingly. 1548 Amend rules accordingly.
1546 (clean): Delete $(COMPILER_TEMP_FILES) instead of *.pdb. 1549 (clean): Delete $(COMPILER_TEMP_FILES) instead of *.pdb.
1547 1550
1548 * nmake.defs (EMACS_ICON_PATH): Delete definition. 1551 * nmake.defs (EMACS_ICON_PATH): Delete definition.
@@ -1785,7 +1788,7 @@
1785 1788
17861999-01-31 Andrew Innes <andrewi@gnu.org> 17891999-01-31 Andrew Innes <andrewi@gnu.org>
1787 1790
1788 * addsection.c (ROUND_UP_DST_AND_ZERO): Renamed from 1791 * addsection.c (ROUND_UP_DST_AND_ZERO): Rename from
1789 ROUND_UP_DST. Zeroes the alignment slop. 1792 ROUND_UP_DST. Zeroes the alignment slop.
1790 (copy_executable_and_add_section): Update the 1793 (copy_executable_and_add_section): Update the
1791 SizeOfHeaders field properly. 1794 SizeOfHeaders field properly.
@@ -2127,7 +2130,7 @@
21271995-06-09 Geoff Voelker <voelker@cs.washington.edu> 21301995-06-09 Geoff Voelker <voelker@cs.washington.edu>
2128 2131
2129 * emacs.bat.in: Renamed from emacs.bat. 2132 * emacs.bat.in: Renamed from emacs.bat.
2130 (emacs_dir): Renamed from emacs_path. 2133 (emacs_dir): Rename from emacs_path.
2131 Definition removed. 2134 Definition removed.
2132 2135
2133 * addpm.c: New file. 2136 * addpm.c: New file.
@@ -2189,7 +2192,7 @@
2189 2192
21901995-04-09 Geoff Voelker <voelker@cs.washington.edu> 21931995-04-09 Geoff Voelker <voelker@cs.washington.edu>
2191 2194
2192 * makefile.def (INSTALL_DIR): Changed to generic directory. 2195 * makefile.def (INSTALL_DIR): Change to generic directory.
2193 2196
2194 * emacs.bat: Added arguments when emacs.exe invoked. 2197 * emacs.bat: Added arguments when emacs.exe invoked.
2195 2198
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 30a5f83ea00..f01ef4f98d1 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -264,7 +264,7 @@ maybe-copy-distfiles-CMD: doit
264 264
265maybe-copy-distfiles-SH: doit 265maybe-copy-distfiles-SH: doit
266 @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" ] ; then \ 266 @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" ] ; then \
267 $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin 267 $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin ; \
268 fi 268 fi
269 269
270create-tmp-dist-dir: 270create-tmp-dist-dir: