diff options
| author | Richard M. Stallman | 1993-01-13 22:20:28 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-01-13 22:20:28 +0000 |
| commit | 08edea3c96aa1a693a5f8ca25f5037ea395306a6 (patch) | |
| tree | e0a4033d7d552643a4deb2e9d519c8f7b5d8d7bf | |
| parent | 7bc18990e1e8d4aae943df4da140d4a4c5ad745a (diff) | |
| download | emacs-08edea3c96aa1a693a5f8ca25f5037ea395306a6.tar.gz emacs-08edea3c96aa1a693a5f8ca25f5037ea395306a6.zip | |
Define MAKE, and use where appropriate.
| -rw-r--r-- | Makefile.in | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in index 76c0245923c..7fb652284d1 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | # Still more severe - delete backup and autosave files, too. | 36 | # Still more severe - delete backup and autosave files, too. |
| 37 | 37 | ||
| 38 | SHELL = /bin/sh | 38 | SHELL = /bin/sh |
| 39 | MAKE = make # BSD doesn't have it as a default. | ||
| 39 | 40 | ||
| 40 | # ==================== Things `configure' Might Edit ==================== | 41 | # ==================== Things `configure' Might Edit ==================== |
| 41 | 42 | ||
| @@ -201,7 +202,7 @@ src: lib-src | |||
| 201 | .RECURSIVE: ${SUBDIR} | 202 | .RECURSIVE: ${SUBDIR} |
| 202 | 203 | ||
| 203 | ${SUBDIR}: ${SUBDIR_MAKEFILES} FRC | 204 | ${SUBDIR}: ${SUBDIR_MAKEFILES} FRC |
| 204 | cd $@; make all ${MFLAGS} \ | 205 | cd $@; $(MAKE) all ${MFLAGS} \ |
| 205 | CC='${CC}' CFLAGS='${CFLAGS}' \ | 206 | CC='${CC}' CFLAGS='${CFLAGS}' \ |
| 206 | srcdir='${srcdir}/$@' libdir='${libdir}' | 207 | srcdir='${srcdir}/$@' libdir='${libdir}' |
| 207 | 208 | ||
| @@ -265,7 +266,7 @@ install: all mkdir | |||
| 265 | ## If we let lib-src do its own installation, that means we | 266 | ## If we let lib-src do its own installation, that means we |
| 266 | ## don't have to duplicate the list of utilities to install in | 267 | ## don't have to duplicate the list of utilities to install in |
| 267 | ## this Makefile as well. | 268 | ## this Makefile as well. |
| 268 | (cd lib-src; make install ${MFLAGS} bindir=${bindir} libdir=${libdir}) | 269 | (cd lib-src; $(MAKE) install ${MFLAGS} bindir=${bindir} libdir=${libdir}) |
| 269 | -set ${COPYDESTS} ; \ | 270 | -set ${COPYDESTS} ; \ |
| 270 | for dir in ${COPYDIR} ; do \ | 271 | for dir in ${COPYDIR} ; do \ |
| 271 | dest=$$1 ; shift ; \ | 272 | dest=$$1 ; shift ; \ |
| @@ -300,7 +301,7 @@ install.sysv: all mkdir | |||
| 300 | ## If we let lib-src do its own installation, that means we | 301 | ## If we let lib-src do its own installation, that means we |
| 301 | ## don't have to duplicate the list of utilities to install in | 302 | ## don't have to duplicate the list of utilities to install in |
| 302 | ## this Makefile as well. | 303 | ## this Makefile as well. |
| 303 | (cd lib-src; make install ${MFLAGS} bindir=${bindir} libdir=${libdir}) | 304 | (cd lib-src; $(MAKE) install ${MFLAGS} bindir=${bindir} libdir=${libdir}) |
| 304 | -set ${COPYDESTS} ; \ | 305 | -set ${COPYDESTS} ; \ |
| 305 | for dir in ${COPYDIR} ; do \ | 306 | for dir in ${COPYDIR} ; do \ |
| 306 | dest=$$1 ; shift ; \ | 307 | dest=$$1 ; shift ; \ |
| @@ -333,7 +334,7 @@ install.xenix: all mkdir | |||
| 333 | ## If we let lib-src do its own installation, that means we | 334 | ## If we let lib-src do its own installation, that means we |
| 334 | ## don't have to duplicate the list of utilities to install in | 335 | ## don't have to duplicate the list of utilities to install in |
| 335 | ## this Makefile as well. | 336 | ## this Makefile as well. |
| 336 | (cd lib-src; make install ${MFLAGS} bindir=${bindir} libdir=${libdir}) | 337 | (cd lib-src; $(MAKE) install ${MFLAGS} bindir=${bindir} libdir=${libdir}) |
| 337 | -set ${COPYDESTS} ; \ | 338 | -set ${COPYDESTS} ; \ |
| 338 | for dir in ${COPYDIR} ; do \ | 339 | for dir in ${COPYDIR} ; do \ |
| 339 | dest=$$1 ; shift ; \ | 340 | dest=$$1 ; shift ; \ |
| @@ -371,7 +372,7 @@ install.aix: all mkdir | |||
| 371 | ## If we let lib-src do its own installation, that means we | 372 | ## If we let lib-src do its own installation, that means we |
| 372 | ## don't have to duplicate the list of utilities to install in | 373 | ## don't have to duplicate the list of utilities to install in |
| 373 | ## this Makefile as well. | 374 | ## this Makefile as well. |
| 374 | (cd lib-src; make install ${MFLAGS} bindir=${bindir} libdir=${libdir}) | 375 | (cd lib-src; $(MAKE) install ${MFLAGS} bindir=${bindir} libdir=${libdir}) |
| 375 | -set ${COPYDESTS} ; \ | 376 | -set ${COPYDESTS} ; \ |
| 376 | for dir in ${COPYDIR} ; do \ | 377 | for dir in ${COPYDIR} ; do \ |
| 377 | dest=$$1 ; shift ; \ | 378 | dest=$$1 ; shift ; \ |
| @@ -427,11 +428,11 @@ FRC: | |||
| 427 | ### recompiling it is rarely necessary and takes a lot of time. | 428 | ### recompiling it is rarely necessary and takes a lot of time. |
| 428 | ### | 429 | ### |
| 429 | clean mostlyclean: | 430 | clean mostlyclean: |
| 430 | cd src; make clean | 431 | cd src; $(MAKE) clean |
| 431 | cd lib-src; make clean | 432 | cd lib-src; $(MAKE) clean |
| 432 | cd oldXMenu; make clean | 433 | cd oldXMenu; $(MAKE) clean |
| 433 | if [ `(cd ${etcdir} ; /bin/pwd` != `(cd etc; /bin/pwd)` ] ; then \ | 434 | if [ `(cd ${etcdir} ; /bin/pwd` != `(cd etc; /bin/pwd)` ] ; then \ |
| 434 | cd etc; make clean; \ | 435 | cd etc; $(MAKE) clean; \ |
| 435 | else true; \ | 436 | else true; \ |
| 436 | fi | 437 | fi |
| 437 | 438 | ||
| @@ -440,7 +441,7 @@ clean mostlyclean: | |||
| 440 | ### configuring or building the program. This should leave only the | 441 | ### configuring or building the program. This should leave only the |
| 441 | ### files that would be in the distribution. | 442 | ### files that would be in the distribution. |
| 442 | distclean: | 443 | distclean: |
| 443 | for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} distclean); done | 444 | for i in ${SUBDIR}; do (cd $$i; $(MAKE) ${MFLAGS} distclean); done |
| 444 | -(cd lock; rm *) | 445 | -(cd lock; rm *) |
| 445 | -rm config.status config-tmp-* | 446 | -rm config.status config-tmp-* |
| 446 | 447 | ||
| @@ -450,7 +451,7 @@ distclean: | |||
| 450 | ### everything deleted by distclean, plus more: C source files | 451 | ### everything deleted by distclean, plus more: C source files |
| 451 | ### produced by Bison, tags tables, info files, and so on. | 452 | ### produced by Bison, tags tables, info files, and so on. |
| 452 | realclean: | 453 | realclean: |
| 453 | for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} realclean); done | 454 | for i in ${SUBDIR}; do (cd $$i; $(MAKE) ${MFLAGS} realclean); done |
| 454 | (cd lock; rm *) | 455 | (cd lock; rm *) |
| 455 | rm config.status | 456 | rm config.status |
| 456 | 457 | ||
| @@ -459,7 +460,7 @@ realclean: | |||
| 459 | ### the coding standards seem to come from. It's like distclean, but | 460 | ### the coding standards seem to come from. It's like distclean, but |
| 460 | ### it deletes backup and autosave files too. | 461 | ### it deletes backup and autosave files too. |
| 461 | extraclean: | 462 | extraclean: |
| 462 | for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} extraclean); done | 463 | for i in ${SUBDIR}; do (cd $$i; $(MAKE) ${MFLAGS} extraclean); done |
| 463 | -(cd lock; rm *) | 464 | -(cd lock; rm *) |
| 464 | -rm config.status config-tmp-* | 465 | -rm config.status config-tmp-* |
| 465 | -rm -f *~ \#* | 466 | -rm -f *~ \#* |