aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorGlenn Morris2014-11-23 11:33:56 -0800
committerGlenn Morris2014-11-23 11:33:56 -0800
commit5a0e58af1ede71cea02cab4ac42ccaa71929f4dc (patch)
tree7b3143e13a48a0c7dfe5a11dbd68f5c69383081c /lib-src
parent2c783bb66163278e77af333c02feaba1443c5e84 (diff)
downloademacs-5a0e58af1ede71cea02cab4ac42ccaa71929f4dc.tar.gz
emacs-5a0e58af1ede71cea02cab4ac42ccaa71929f4dc.zip
* lib-src/Makefile.in (emacsclient.res): Fix yesterday's thinko.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/Makefile.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4fc3b4dbe57..5260ed039fc 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
12014-11-23 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (emacsclient.res): Fix yesterday's thinko.
4
12014-11-22 Glenn Morris <rgm@gnu.org> 52014-11-22 Glenn Morris <rgm@gnu.org>
2 6
3 * Makefile.in (emacsclient.res): Update deps for nt/emacsclient.rc 7 * Makefile.in (emacsclient.res): Update deps for nt/emacsclient.rc
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 432314f02dd..77d3b78096a 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -388,7 +388,7 @@ update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h)
388 -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \ 388 -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
389 $< $(LOADLIBES) $(NTLIB) -o $@ 389 $< $(LOADLIBES) $(NTLIB) -o $@
390 390
391emacsclient.res: ../nt/emacsclient.rc ${srcdir}/icons/emacs.ico 391emacsclient.res: ../nt/emacsclient.rc $(NTINC)/../icons/emacs.ico
392 $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $< 392 $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $<
393 393
394## Makefile ends here. 394## Makefile ends here.