aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-08-01 23:21:48 -0700
committerGlenn Morris2012-08-01 23:21:48 -0700
commitd66b744dc30e758551558ebfcf05e89914f0a97c (patch)
tree37357b26067ef627de974b49266d75f76a7177b9
parent837b365b2ad2363c59f9c1fd78beab92a5eada02 (diff)
downloademacs-d66b744dc30e758551558ebfcf05e89914f0a97c.tar.gz
emacs-d66b744dc30e758551558ebfcf05e89914f0a97c.zip
* src/s/: Remove empty directory.
* make-dist: Remove src/s.
-rw-r--r--ChangeLog2
-rwxr-xr-xmake-dist6
-rw-r--r--src/ChangeLog2
3 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 60376bc4158..32b99db1ed1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
12012-08-02 Glenn Morris <rgm@gnu.org> 12012-08-02 Glenn Morris <rgm@gnu.org>
2 2
3 * make-dist: Remove src/s.
4
3 * lib/makefile.w32-in (MS_W32_H): Update for new ms-w32.h location. 5 * lib/makefile.w32-in (MS_W32_H): Update for new ms-w32.h location.
4 6
52012-08-02 Paul Eggert <eggert@cs.ucla.edu> 72012-08-02 Paul Eggert <eggert@cs.ucla.edu>
diff --git a/make-dist b/make-dist
index cc14ff3987b..b157d9a54d6 100755
--- a/make-dist
+++ b/make-dist
@@ -282,7 +282,7 @@ for subdir in site-lisp \
282 leim leim/CXTERM-DIC leim/MISC-DIC \ 282 leim leim/CXTERM-DIC leim/MISC-DIC \
283 leim/SKK-DIC leim/ja-dic leim/quail \ 283 leim/SKK-DIC leim/ja-dic leim/quail \
284 build-aux build-aux/snippet \ 284 build-aux build-aux/snippet \
285 src src/s src/bitmaps lib lib-src oldXMenu lwlib \ 285 src src/bitmaps lib lib-src oldXMenu lwlib \
286 nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ 286 nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
287 `find etc lisp admin -type d` \ 287 `find etc lisp admin -type d` \
288 doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \ 288 doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \
@@ -359,10 +359,6 @@ echo "Making links to \`src/bitmaps'"
359(cd src/bitmaps 359(cd src/bitmaps
360 ln README *.xbm ../../${tempdir}/src/bitmaps) 360 ln README *.xbm ../../${tempdir}/src/bitmaps)
361 361
362echo "Making links to \`src/s'"
363(cd src/s
364 ln README [a-zA-Z0-9]*.h ../../${tempdir}/src/s)
365
366echo "Making links to \`lib'" 362echo "Making links to \`lib'"
367(snippet_h=`(cd build-aux/snippet && ls *.h)` 363(snippet_h=`(cd build-aux/snippet && ls *.h)`
368 cd lib 364 cd lib
diff --git a/src/ChangeLog b/src/ChangeLog
index 906107a667d..d1f539bcf2d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12012-08-02 Glenn Morris <rgm@gnu.org> 12012-08-02 Glenn Morris <rgm@gnu.org>
2 2
3 * s/: Remove empty directory.
4
3 * s/ms-w32.h: Move to ../nt/inc. 5 * s/ms-w32.h: Move to ../nt/inc.
4 * makefile.w32-in (TAGS, TAGS-gmake, MS_W32_H): 6 * makefile.w32-in (TAGS, TAGS-gmake, MS_W32_H):
5 Update for new ms-w32.h location. 7 Update for new ms-w32.h location.