aboutsummaryrefslogtreecommitdiffstats
path: root/make-dist
diff options
context:
space:
mode:
authorPaul Eggert2015-04-19 14:40:51 -0700
committerPaul Eggert2015-04-19 14:44:50 -0700
commit9099d45df734f63145d414a0e1205245973c9efb (patch)
tree45d131ea09c07024f85bb27c1ada901e40a45331 /make-dist
parent62e170072e6000b30c37792227dc34e71a31d797 (diff)
downloademacs-9099d45df734f63145d414a0e1205245973c9efb.tar.gz
emacs-9099d45df734f63145d414a0e1205245973c9efb.zip
Quote 'like this' in top-level files
* CONTRIBUTE, INSTALL, Makefile.in, README, configure.ac, make-dist: Prefer to single-quote 'like this' (instead of the older style `like this'). * configure.ac: Fix some space-before-tab problems that 'git commit' complained about.
Diffstat (limited to 'make-dist')
-rwxr-xr-xmake-dist82
1 files changed, 41 insertions, 41 deletions
diff --git a/make-dist b/make-dist
index 1c7ce59e167..441070fd7c0 100755
--- a/make-dist
+++ b/make-dist
@@ -80,7 +80,7 @@ while [ $# -gt 0 ]; do
80 new_extension=".new" 80 new_extension=".new"
81 shift 81 shift
82 ;; 82 ;;
83 ## This option tells make-dist to use `bzip2' instead of gzip. 83 ## This option tells make-dist to use 'bzip2' instead of gzip.
84 "--bzip2") 84 "--bzip2")
85 default_gzip="bzip2" 85 default_gzip="bzip2"
86 ;; 86 ;;
@@ -132,7 +132,7 @@ done
132 132
133### Make sure we're running in the right place. 133### Make sure we're running in the right place.
134if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/subr.el ]; then 134if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/subr.el ]; then
135 echo "${progname}: Can't find \`src/lisp.h' and \`lisp/subr.el'." >&2 135 echo "${progname}: Can't find 'src/lisp.h' and 'lisp/subr.el'." >&2
136 echo "${progname} must be run in the top directory of the Emacs" >&2 136 echo "${progname} must be run in the top directory of the Emacs" >&2
137 echo "distribution tree. cd to that directory and try again." >&2 137 echo "distribution tree. cd to that directory and try again." >&2
138 exit 1 138 exit 1
@@ -163,7 +163,7 @@ version=`
163 sed -n 's/^AC_INIT(GNU Emacs,[ ]*\([^ ,)]*\).*/\1/p' <configure.ac 163 sed -n 's/^AC_INIT(GNU Emacs,[ ]*\([^ ,)]*\).*/\1/p' <configure.ac
164` || version= 164` || version=
165if [ ! "${version}" ]; then 165if [ ! "${version}" ]; then
166 echo "${progname}: can't find current Emacs version in \`./src/emacs.c'" >&2 166 echo "${progname}: can't find current Emacs version in './src/emacs.c'" >&2
167 exit 1 167 exit 1
168fi 168fi
169 169
@@ -190,10 +190,10 @@ fi
190### Make sure the subdirectory is available. 190### Make sure the subdirectory is available.
191tempparent="make-dist.tmp.$$" 191tempparent="make-dist.tmp.$$"
192if [ -d ${tempparent} ]; then 192if [ -d ${tempparent} ]; then
193 echo "${progname}: staging directory \`${tempparent}' already exists. 193 echo "${progname}: staging directory '${tempparent}' already exists.
194Perhaps a previous invocation of \`${progname}' failed to clean up after 194Perhaps a previous invocation of '${progname}' failed to clean up after
195itself. Check that directories whose names are of the form 195itself. Check that directories whose names are of the form
196\`make-dist.tmp.NNNNN' don't contain any important information, remove 196'make-dist.tmp.NNNNN' don't contain any important information, remove
197them, and try again." >&2 197them, and try again." >&2
198 exit 1 198 exit 1
199fi 199fi
@@ -210,7 +210,7 @@ if [ $check = yes ]; then
210 ## Check for .elc files with no corresponding .el file. 210 ## Check for .elc files with no corresponding .el file.
211 sed 's/\.el$/.elc/' /tmp/el > /tmp/elelc 211 sed 's/\.el$/.elc/' /tmp/el > /tmp/elelc
212 212
213 bogosities="`comm -13 /tmp/elelc /tmp/elc`" 213 bogosities=`comm -13 /tmp/elelc /tmp/elc`
214 if [ x"${bogosities}" != x"" ]; then 214 if [ x"${bogosities}" != x"" ]; then
215 echo "The following .elc files have no corresponding .el files:" 215 echo "The following .elc files have no corresponding .el files:"
216 echo "${bogosities}" 216 echo "${bogosities}"
@@ -218,7 +218,7 @@ if [ $check = yes ]; then
218 218
219 ### Check for .el files with no corresponding .elc file. 219 ### Check for .el files with no corresponding .elc file.
220 sed 's/\.elc$/.el/' /tmp/elc > /tmp/elcel 220 sed 's/\.elc$/.el/' /tmp/elc > /tmp/elcel
221 losers="`comm -23 /tmp/el /tmp/elcel`" 221 losers=`comm -23 /tmp/el /tmp/elcel`
222 222
223 rm -f /tmp/el /tmp/elc /tmp/elcel /tmp/elelc 223 rm -f /tmp/el /tmp/elc /tmp/elcel /tmp/elelc
224 224
@@ -263,7 +263,7 @@ if [ $update = yes ]; then
263 $EMACS -batch -f batch-byte-recompile-directory lisp 263 $EMACS -batch -f batch-byte-recompile-directory lisp
264fi # $update = yes 264fi # $update = yes
265 265
266echo "Creating staging directory: \`${tempparent}'" 266echo "Creating staging directory: '${tempparent}'"
267 267
268mkdir ${tempparent} 268mkdir ${tempparent}
269tempdir="${tempparent}/${emacsname}" 269tempdir="${tempparent}/${emacsname}"
@@ -274,7 +274,7 @@ if [ "${clean_up}" = yes ]; then
274 trap "echo 'Cleaning up the staging directory'; rm -rf ${tempparent}" EXIT 274 trap "echo 'Cleaning up the staging directory'; rm -rf ${tempparent}" EXIT
275fi 275fi
276 276
277echo "Creating top directory: \`${tempdir}'" 277echo "Creating top directory: '${tempdir}'"
278mkdir ${tempdir} 278mkdir ${tempdir}
279 279
280if test -d .git; then 280if test -d .git; then
@@ -325,7 +325,7 @@ do
325 mkdir ${tempdir}/${subdir} 325 mkdir ${tempdir}/${subdir}
326done 326done
327 327
328echo "Making links to \`lisp' and its subdirectories" 328echo "Making links to 'lisp' and its subdirectories"
329files=`find lisp \( -name '*.el' -o -name '*.elc' -o -name 'ChangeLog*' \ 329files=`find lisp \( -name '*.el' -o -name '*.elc' -o -name 'ChangeLog*' \
330 -o -name 'README' \)` 330 -o -name 'README' \)`
331 331
@@ -337,7 +337,7 @@ for file in lisp/Makefile.in lisp/makefile.w32-in $files; do
337 ln $file $tempdir/$file 337 ln $file $tempdir/$file
338done 338done
339 339
340echo "Making links to \`leim' and its subdirectories" 340echo "Making links to 'leim' and its subdirectories"
341(cd leim 341(cd leim
342 ln makefile.w32-in ../${tempdir}/leim 342 ln makefile.w32-in ../${tempdir}/leim
343 ln ChangeLog.*[0-9] README ../${tempdir}/leim 343 ln ChangeLog.*[0-9] README ../${tempdir}/leim
@@ -348,7 +348,7 @@ echo "Making links to \`leim' and its subdirectories"
348 ln leim-ext.el ../${tempdir}/leim/leim-ext.el) 348 ln leim-ext.el ../${tempdir}/leim/leim-ext.el)
349 349
350## FIXME Can we not just use the "find -type f" method for this one? 350## FIXME Can we not just use the "find -type f" method for this one?
351echo "Making links to \`build-aux'" 351echo "Making links to 'build-aux'"
352(cd build-aux 352(cd build-aux
353 ln compile config.guess config.sub depcomp msys-to-w32 ../${tempdir}/build-aux 353 ln compile config.guess config.sub depcomp msys-to-w32 ../${tempdir}/build-aux
354 ln gitlog-to-changelog gitlog-to-emacslog ../${tempdir}/build-aux 354 ln gitlog-to-changelog gitlog-to-emacslog ../${tempdir}/build-aux
@@ -356,11 +356,11 @@ echo "Making links to \`build-aux'"
356 ln update-copyright update-subdirs ../${tempdir}/build-aux 356 ln update-copyright update-subdirs ../${tempdir}/build-aux
357 ln dir_top make-info-dir ../${tempdir}/build-aux) 357 ln dir_top make-info-dir ../${tempdir}/build-aux)
358 358
359echo "Making links to \`build-aux/snippet'" 359echo "Making links to 'build-aux/snippet'"
360(cd build-aux/snippet 360(cd build-aux/snippet
361 ln *.h ../../${tempdir}/build-aux/snippet) 361 ln *.h ../../${tempdir}/build-aux/snippet)
362 362
363echo "Making links to \`src'" 363echo "Making links to 'src'"
364### Don't distribute the configured versions of 364### Don't distribute the configured versions of
365### config.in, paths.in, buildobj.h, or Makefile.in. 365### config.in, paths.in, buildobj.h, or Makefile.in.
366(cd src 366(cd src
@@ -374,11 +374,11 @@ echo "Making links to \`src'"
374 cd ../${tempdir}/src 374 cd ../${tempdir}/src
375 rm -f globals.h config.h epaths.h Makefile buildobj.h) 375 rm -f globals.h config.h epaths.h Makefile buildobj.h)
376 376
377echo "Making links to \`src/bitmaps'" 377echo "Making links to 'src/bitmaps'"
378(cd src/bitmaps 378(cd src/bitmaps
379 ln README *.xbm ../../${tempdir}/src/bitmaps) 379 ln README *.xbm ../../${tempdir}/src/bitmaps)
380 380
381echo "Making links to \`lib'" 381echo "Making links to 'lib'"
382(snippet_h=`(cd build-aux/snippet && ls *.h)` 382(snippet_h=`(cd build-aux/snippet && ls *.h)`
383 cd lib 383 cd lib
384 ln [a-zA-Z]*.[ch] ../${tempdir}/lib 384 ln [a-zA-Z]*.[ch] ../${tempdir}/lib
@@ -387,7 +387,7 @@ echo "Making links to \`lib'"
387 script='/[*]/d; s/\.in\.h$/.h/' 387 script='/[*]/d; s/\.in\.h$/.h/'
388 rm -f `(echo "$snippet_h"; ls *.in.h) | sed "$script"`) 388 rm -f `(echo "$snippet_h"; ls *.in.h) | sed "$script"`)
389 389
390echo "Making links to \`lib-src'" 390echo "Making links to 'lib-src'"
391(cd lib-src 391(cd lib-src
392 ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src 392 ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src
393 ln ChangeLog.*[0-9] Makefile.in README ../${tempdir}/lib-src 393 ln ChangeLog.*[0-9] Makefile.in README ../${tempdir}/lib-src
@@ -395,11 +395,11 @@ echo "Making links to \`lib-src'"
395 ln makefile.w32-in ../${tempdir}/lib-src 395 ln makefile.w32-in ../${tempdir}/lib-src
396 ln update-game-score.exe.manifest ../${tempdir}/lib-src) 396 ln update-game-score.exe.manifest ../${tempdir}/lib-src)
397 397
398echo "Making links to \`m4'" 398echo "Making links to 'm4'"
399(cd m4 399(cd m4
400 ln *.m4 ../${tempdir}/m4) 400 ln *.m4 ../${tempdir}/m4)
401 401
402echo "Making links to \`nt'" 402echo "Making links to 'nt'"
403(cd nt 403(cd nt
404 ln emacs-x86.manifest emacs-x64.manifest ../${tempdir}/nt 404 ln emacs-x86.manifest emacs-x64.manifest ../${tempdir}/nt
405 ln config.nt emacs-src.tags ../${tempdir}/nt 405 ln config.nt emacs-src.tags ../${tempdir}/nt
@@ -408,55 +408,55 @@ echo "Making links to \`nt'"
408 ln mingw-cfg.site epaths.nt INSTALL.OLD ../${tempdir}/nt 408 ln mingw-cfg.site epaths.nt INSTALL.OLD ../${tempdir}/nt
409 ln ChangeLog.*[0-9] INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt) 409 ln ChangeLog.*[0-9] INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt)
410 410
411echo "Making links to \`nt/inc' and its subdirectories" 411echo "Making links to 'nt/inc' and its subdirectories"
412for f in `find nt/inc -type f -name '[a-z]*.h'`; do 412for f in `find nt/inc -type f -name '[a-z]*.h'`; do
413 ln $f $tempdir/$f 413 ln $f $tempdir/$f
414done 414done
415 415
416echo "Making links to \`nt/icons'" 416echo "Making links to 'nt/icons'"
417(cd nt/icons 417(cd nt/icons
418 ln README [a-z]*.ico ../../${tempdir}/nt/icons 418 ln README [a-z]*.ico ../../${tempdir}/nt/icons
419 ln [a-z]*.cur ../../${tempdir}/nt/icons) 419 ln [a-z]*.cur ../../${tempdir}/nt/icons)
420 420
421echo "Making links to \`msdos'" 421echo "Making links to 'msdos'"
422(cd msdos 422(cd msdos
423 ln ChangeLog.*[0-9] INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos 423 ln ChangeLog.*[0-9] INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos
424 ln depfiles.bat inttypes.h ../${tempdir}/msdos 424 ln depfiles.bat inttypes.h ../${tempdir}/msdos
425 ln mainmake.v2 sed*.inp ../${tempdir}/msdos) 425 ln mainmake.v2 sed*.inp ../${tempdir}/msdos)
426 426
427echo "Making links to \`nextstep'" 427echo "Making links to 'nextstep'"
428(cd nextstep 428(cd nextstep
429 ln ChangeLog.*[0-9] README INSTALL Makefile.in ../${tempdir}/nextstep) 429 ln ChangeLog.*[0-9] README INSTALL Makefile.in ../${tempdir}/nextstep)
430 430
431echo "Making links to \`nextstep/templates'" 431echo "Making links to 'nextstep/templates'"
432(cd nextstep/templates 432(cd nextstep/templates
433 ln Emacs.desktop.in Info-gnustep.plist.in Info.plist.in InfoPlist.strings.in ../../${tempdir}/nextstep/templates) 433 ln Emacs.desktop.in Info-gnustep.plist.in Info.plist.in InfoPlist.strings.in ../../${tempdir}/nextstep/templates)
434 434
435echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents'" 435echo "Making links to 'nextstep/Cocoa/Emacs.base/Contents'"
436(cd nextstep/Cocoa/Emacs.base/Contents 436(cd nextstep/Cocoa/Emacs.base/Contents
437 ln PkgInfo ../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents) 437 ln PkgInfo ../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents)
438 438
439echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents/Resources'" 439echo "Making links to 'nextstep/Cocoa/Emacs.base/Contents/Resources'"
440(cd nextstep/Cocoa/Emacs.base/Contents/Resources 440(cd nextstep/Cocoa/Emacs.base/Contents/Resources
441 ln Credits.html *.icns ../../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents/Resources) 441 ln Credits.html *.icns ../../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents/Resources)
442 442
443echo "Making links to \`nextstep/GNUstep/Emacs.base/Resources'" 443echo "Making links to 'nextstep/GNUstep/Emacs.base/Resources'"
444(cd nextstep/GNUstep/Emacs.base/Resources 444(cd nextstep/GNUstep/Emacs.base/Resources
445 ln README emacs.tiff ../../../../${tempdir}/nextstep/GNUstep/Emacs.base/Resources ) 445 ln README emacs.tiff ../../../../${tempdir}/nextstep/GNUstep/Emacs.base/Resources )
446 446
447echo "Making links to \`oldXMenu'" 447echo "Making links to 'oldXMenu'"
448(cd oldXMenu 448(cd oldXMenu
449 ln *.[ch] *.in *.mk ../${tempdir}/oldXMenu 449 ln *.[ch] *.in *.mk ../${tempdir}/oldXMenu
450 ln README ChangeLog.*[0-9] ../${tempdir}/oldXMenu) 450 ln README ChangeLog.*[0-9] ../${tempdir}/oldXMenu)
451 451
452echo "Making links to \`lwlib'" 452echo "Making links to 'lwlib'"
453(cd lwlib 453(cd lwlib
454 ln *.[ch] *.in *.mk ../${tempdir}/lwlib 454 ln *.[ch] *.in *.mk ../${tempdir}/lwlib
455 ln README ChangeLog.*[0-9] ../${tempdir}/lwlib) 455 ln README ChangeLog.*[0-9] ../${tempdir}/lwlib)
456 456
457## It is important to distribute admin/ because it contains sources 457## It is important to distribute admin/ because it contains sources
458## for generated lisp/international/uni-*.el files. 458## for generated lisp/international/uni-*.el files.
459echo "Making links to \`admin' and its subdirectories" 459echo "Making links to 'admin' and its subdirectories"
460for f in `find admin -type f`; do 460for f in `find admin -type f`; do
461 case $f in 461 case $f in
462 */Makefile) [ -f $f.in ] && continue ;; 462 */Makefile) [ -f $f.in ] && continue ;;
@@ -465,7 +465,7 @@ for f in `find admin -type f`; do
465done 465done
466 466
467if [ "$with_tests" = "yes" ]; then 467if [ "$with_tests" = "yes" ]; then
468 echo "Making links to \`test' and its subdirectories" 468 echo "Making links to 'test' and its subdirectories"
469 for f in `find test -type f`; do 469 for f in `find test -type f`; do
470 case $f in 470 case $f in
471 test/automated/*.log) continue ;; 471 test/automated/*.log) continue ;;
@@ -476,7 +476,7 @@ if [ "$with_tests" = "yes" ]; then
476 done 476 done
477fi 477fi
478 478
479echo "Making links to \`etc' and its subdirectories" 479echo "Making links to 'etc' and its subdirectories"
480for f in `find etc -type f`; do 480for f in `find etc -type f`; do
481 case $f in 481 case $f in
482 etc/DOC*|etc/*.pyc) continue ;; 482 etc/DOC*|etc/*.pyc) continue ;;
@@ -487,32 +487,32 @@ for f in `find etc -type f`; do
487 ln $f $tempdir/$f 487 ln $f $tempdir/$f
488done 488done
489 489
490echo "Making links to \`info'" 490echo "Making links to 'info'"
491ln `find info -type f -print` ${tempdir}/info 491ln `find info -type f -print` ${tempdir}/info
492 492
493echo "Making links to \`doc/emacs'" 493echo "Making links to 'doc/emacs'"
494(cd doc/emacs 494(cd doc/emacs
495 ln *.texi *.in makefile.w32-in ChangeLog.*[0-9] ../../${tempdir}/doc/emacs) 495 ln *.texi *.in makefile.w32-in ChangeLog.*[0-9] ../../${tempdir}/doc/emacs)
496 496
497echo "Making links to \`doc/misc'" 497echo "Making links to 'doc/misc'"
498(cd doc/misc 498(cd doc/misc
499 ln *.texi *.tex *.in makefile.w32-in gnus-news.el ChangeLog.*[0-9] \ 499 ln *.texi *.tex *.in makefile.w32-in gnus-news.el ChangeLog.*[0-9] \
500 ../../${tempdir}/doc/misc) 500 ../../${tempdir}/doc/misc)
501 501
502echo "Making links to \`doc/lispref'" 502echo "Making links to 'doc/lispref'"
503(cd doc/lispref 503(cd doc/lispref
504 ln *.texi *.in makefile.w32-in README ChangeLog.*[0-9] \ 504 ln *.texi *.in makefile.w32-in README ChangeLog.*[0-9] \
505 ../../${tempdir}/doc/lispref 505 ../../${tempdir}/doc/lispref
506 ln spellfile ../../${tempdir}/doc/lispref 506 ln spellfile ../../${tempdir}/doc/lispref
507 ln two-volume.make two-volume-cross-refs.txt ../../${tempdir}/doc/lispref) 507 ln two-volume.make two-volume-cross-refs.txt ../../${tempdir}/doc/lispref)
508 508
509echo "Making links to \`doc/lispintro'" 509echo "Making links to 'doc/lispintro'"
510(cd doc/lispintro 510(cd doc/lispintro
511 ln *.texi *.in makefile.w32-in *.eps *.pdf ../../${tempdir}/doc/lispintro 511 ln *.texi *.in makefile.w32-in *.eps *.pdf ../../${tempdir}/doc/lispintro
512 ln README ChangeLog.*[0-9] ../../${tempdir}/doc/lispintro 512 ln README ChangeLog.*[0-9] ../../${tempdir}/doc/lispintro
513 cd ../../${tempdir}/doc/lispintro) 513 cd ../../${tempdir}/doc/lispintro)
514 514
515echo "Making links to \`doc/man'" 515echo "Making links to 'doc/man'"
516(cd doc/man 516(cd doc/man
517 ln *.*[0-9] *.in ../../${tempdir}/doc/man 517 ln *.*[0-9] *.in ../../${tempdir}/doc/man
518 cd ../../${tempdir}/doc/man 518 cd ../../${tempdir}/doc/man
@@ -520,7 +520,7 @@ echo "Making links to \`doc/man'"
520 520
521### It would be nice if they could all be symlinks to top-level copy, but 521### It would be nice if they could all be symlinks to top-level copy, but
522### you're not supposed to have any symlinks in distribution tar files. 522### you're not supposed to have any symlinks in distribution tar files.
523echo "Making sure copying notices are all copies of \`COPYING'" 523echo "Making sure copying notices are all copies of 'COPYING'"
524for subdir in . etc leim lib lib-src lisp lwlib msdos nt src; do 524for subdir in . etc leim lib lib-src lisp lwlib msdos nt src; do
525 rm -f ${tempdir}/${subdir}/COPYING 525 rm -f ${tempdir}/${subdir}/COPYING
526 cp COPYING ${tempdir}/${subdir} 526 cp COPYING ${tempdir}/${subdir}
@@ -548,7 +548,7 @@ if [ "${make_tar}" = yes ]; then
548 found=1; break 548 found=1; break
549 done 549 done
550 if [ "$found" = "0" ]; then 550 if [ "$found" = "0" ]; then
551 echo "WARNING: \`$default_gzip' not found, will not compress" >&2 551 echo "WARNING: '$default_gzip' not found, will not compress" >&2
552 default_gzip=cat 552 default_gzip=cat
553 fi 553 fi
554 case "${default_gzip}" in 554 case "${default_gzip}" in