diff options
| author | Glenn Morris | 2010-05-29 11:54:16 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-29 11:54:16 -0700 |
| commit | 8cce271eac68fef59d37c95b28784693c26e55e9 (patch) | |
| tree | 033dbd205787928bae84e30be4b087edacedef8a | |
| parent | bc8d33d540d079af28ea93a0cf8df829911044ca (diff) | |
| download | emacs-8cce271eac68fef59d37c95b28784693c26e55e9.tar.gz emacs-8cce271eac68fef59d37c95b28784693c26e55e9.zip | |
Add some comments related to how epaths.h gets built.
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | configure.in | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index cd677d3295d..965fdd9c562 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -279,6 +279,9 @@ all: ${SUBDIR} leim | |||
| 279 | removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' | 279 | removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' |
| 280 | 280 | ||
| 281 | # Generate epaths.h from epaths.in. This target is invoked by `configure'. | 281 | # Generate epaths.h from epaths.in. This target is invoked by `configure'. |
| 282 | # See comments in configure.in for why it is done this way, as opposed | ||
| 283 | # to just letting configure generate epaths.h from epaths.in in a | ||
| 284 | # similar way to how Makefile is made from Makefile.in. | ||
| 282 | epaths-force: FRC | 285 | epaths-force: FRC |
| 283 | @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ | 286 | @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ |
| 284 | buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ | 287 | buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ |
diff --git a/configure.in b/configure.in index 5ceb2c3bd48..9694a91739f 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -32,6 +32,10 @@ dnl Support for --program-prefix, --program-suffix and | |||
| 32 | dnl --program-transform-name options | 32 | dnl --program-transform-name options |
| 33 | AC_ARG_PROGRAM | 33 | AC_ARG_PROGRAM |
| 34 | 34 | ||
| 35 | dnl It is important that variables on the RHS not be expanded here, | ||
| 36 | dnl hence the single quotes. This is per the GNU coding standards, see | ||
| 37 | dnl (autoconf) Installation Directory Variables | ||
| 38 | dnl See also epaths.h below. | ||
| 35 | lispdir='${datadir}/emacs/${version}/lisp' | 39 | lispdir='${datadir}/emacs/${version}/lisp' |
| 36 | locallisppath='${datadir}/emacs/${version}/site-lisp:'\ | 40 | locallisppath='${datadir}/emacs/${version}/site-lisp:'\ |
| 37 | '${datadir}/emacs/site-lisp' | 41 | '${datadir}/emacs/site-lisp' |
| @@ -3750,6 +3754,14 @@ fi | |||
| 3750 | test "${exec_prefix}" != NONE && | 3754 | test "${exec_prefix}" != NONE && |
| 3751 | exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`] | 3755 | exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`] |
| 3752 | 3756 | ||
| 3757 | dnl You might wonder (I did) why epaths.h is generated by running make, | ||
| 3758 | dnl rather than just letting configure generate it from epaths.in. | ||
| 3759 | dnl One reason is that the various paths are not fully expanded (see above); | ||
| 3760 | dnl eg gamedir=${prefix}/var/games/emacs. | ||
| 3761 | dnl Secondly, the GNU Coding standards require that one should be able | ||
| 3762 | dnl to run `make prefix=/some/where/else' and override the values set | ||
| 3763 | dnl by configure. This also explains the `move-if-change' test and | ||
| 3764 | dnl the use of force in the `epaths-force' rule in Makefile.in. | ||
| 3753 | AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile \ | 3765 | AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile \ |
| 3754 | doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \ | 3766 | doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \ |
| 3755 | doc/lispref/Makefile src/Makefile \ | 3767 | doc/lispref/Makefile src/Makefile \ |