aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Blandy1993-05-25 14:15:30 +0000
committerJim Blandy1993-05-25 14:15:30 +0000
commit64dacd01675249bd819e0e861b83456c69fd0153 (patch)
tree0a709948fcc86965633894de9170b39a2675e6be
parentbf489d26face57127fb118eb3b6c18189c6fab5c (diff)
downloademacs-64dacd01675249bd819e0e861b83456c69fd0153.tar.gz
emacs-64dacd01675249bd819e0e861b83456c69fd0153.zip
* configure.in: When looking for source in the same directory as
the configure script, make the path thus discovered absolute. If the user specifies the `--srcdir' switch, make that directory absolute too.
-rwxr-xr-xconfigure1.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure1.in b/configure1.in
index df41927674b..1238db91d6d 100755
--- a/configure1.in
+++ b/configure1.in
@@ -286,7 +286,7 @@ case "${srcdir}" in
286 "" ) 286 "" )
287 confdir=`echo $0 | sed 's|//|/|' | sed 's|/[^/]*$||'` 287 confdir=`echo $0 | sed 's|//|/|' | sed 's|/[^/]*$||'`
288 if [ -f $confdir/src/lisp.h -a -f $confdir/lisp/version.el ]; then 288 if [ -f $confdir/src/lisp.h -a -f $confdir/lisp/version.el ]; then
289 srcdir=$confdir 289 srcdir=`(cd $confdir ; pwd)`
290 else 290 else
291 if [ -f "./src/lisp.h" -a -f "./lisp/version.el" ]; then 291 if [ -f "./src/lisp.h" -a -f "./lisp/version.el" ]; then
292 srcdir=`pwd` 292 srcdir=`pwd`
@@ -309,6 +309,7 @@ sources may be found."
309 309
310 ## Otherwise, check if the directory they specified is okay. 310 ## Otherwise, check if the directory they specified is okay.
311 * ) 311 * )
312 srcdir=`(cd ${srcdir}; pwd)`
312 if [ ! -d "${srcdir}" -o ! -f "${srcdir}/src/lisp.h" -o ! -f "${srcdir}/lisp/version.el" ]; then 313 if [ ! -d "${srcdir}" -o ! -f "${srcdir}/src/lisp.h" -o ! -f "${srcdir}/lisp/version.el" ]; then
313 (echo "\ 314 (echo "\
314${progname}: The directory specified with the \`--srcdir' option, 315${progname}: The directory specified with the \`--srcdir' option,