mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-12 12:21:15 -08:00
Code Issues Projects Releases Packages Wiki Activity

Due to VPATH, lsp/config.lsp would sometimes be built, and sometimes not. Also, extension '.in' is not good for the files output by configure

Browse source
This commit is contained in:
jjgarcia 2003-12-05 10:22:24 +00:00
parent 8de4862ffe
commit c6b914dc7b
4 changed files with 21 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Makefile.in
View file

@ -3,7 +3,6 @@
#
top_srcdir= @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
# Programs used by "make":
#
@ -63,14 +62,14 @@ ecl_min$(EXE): $(LIBRARIES) .gdbinit libecl.a
.gdbinit: $(srcdir)/util/gdbinit
cp $(srcdir)/util/gdbinit $@
lsp/config.lsp: lsp/config.lsp.in
sed -e 's,@ecldir@,$(libdir),g' < lsp/config.lsp.in > lsp/config.lsp
compile.lsp: compile.lsp.in
sed -e 's,@ecldir@,$(libdir),g' < compile.lsp.in > compile.lsp
ecl-config: ecl-config.in
lsp/config.lsp: lsp/config.pre
sed -e 's,@ecldir@,$(libdir),g' < lsp/config.pre > lsp/config.lsp
compile.lsp: compile.pre
sed -e 's,@ecldir@,$(libdir),g' < compile.pre > compile.lsp
ecl-config: ecl-config.pre
sed -e 's,~A,$(libdir),;s,~\*,,' \
-e 's,@libdir\\@,$(libdir),' \
-e 's,@includedir\\@,$(libdir)/h,' ecl-config.in > ecl-config
-e 's,@includedir\\@,$(libdir)/h,' ecl-config.pre > ecl-config
@LIBPREFIX@ecl.@LIBEXT@: @LIBPREFIX@gmp.@LIBEXT@ @LIBPREFIX@gc.@LIBEXT@ lsp/config.lsp

15
src/configure vendored
View file

@ -6016,15 +6016,15 @@ else
echo "$as_me:$LINENO: result: already installed" >&5
echo "${ECHO_T}already installed" >&6
fi
ac_config_files="$ac_config_files bare.lsp lsp/config.lsp cmp/cmpcfg.lsp lsp/load.lsp clos/load.lsp cmp/load.lsp ../Makefile Makefile c/Makefile doc/Makefile doc/ecl.man tk/Makefile tests/Makefile ansi-tests/Makefile gabriel/Makefile"
ac_config_files="$ac_config_files bare.lsp cmp/cmpcfg.lsp lsp/load.lsp clos/load.lsp cmp/load.lsp ../Makefile Makefile c/Makefile doc/Makefile doc/ecl.man tk/Makefile tests/Makefile ansi-tests/Makefile gabriel/Makefile"
ac_config_files="$ac_config_files ecl-config.in:util/ecl-config"
ac_config_files="$ac_config_files ecl-config.pre:util/ecl-config"
ac_config_files="$ac_config_files h/configpre:h/config.h.in"
ac_config_files="$ac_config_files lsp/config.lsp.in:lsp/config.lsp.in"
ac_config_files="$ac_config_files lsp/config.pre:lsp/config.lsp.in"
ac_config_files="$ac_config_files compile.lsp.in:compile.lsp.in"
ac_config_files="$ac_config_files compile.pre:compile.lsp.in"
ac_config_headers="$ac_config_headers h/config.h:h/configpre"
@ -6553,7 +6553,6 @@ do
case "$ac_config_target" in
# Handling of arguments.
"bare.lsp" ) CONFIG_FILES="$CONFIG_FILES bare.lsp" ;;
"lsp/config.lsp" ) CONFIG_FILES="$CONFIG_FILES lsp/config.lsp" ;;
"cmp/cmpcfg.lsp" ) CONFIG_FILES="$CONFIG_FILES cmp/cmpcfg.lsp" ;;
"lsp/load.lsp" ) CONFIG_FILES="$CONFIG_FILES lsp/load.lsp" ;;
"clos/load.lsp" ) CONFIG_FILES="$CONFIG_FILES clos/load.lsp" ;;
@ -6567,10 +6566,10 @@ do
"tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"ansi-tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES ansi-tests/Makefile" ;;
"gabriel/Makefile" ) CONFIG_FILES="$CONFIG_FILES gabriel/Makefile" ;;
"ecl-config.in" ) CONFIG_FILES="$CONFIG_FILES ecl-config.in:util/ecl-config" ;;
"ecl-config.pre" ) CONFIG_FILES="$CONFIG_FILES ecl-config.pre:util/ecl-config" ;;
"h/configpre" ) CONFIG_FILES="$CONFIG_FILES h/configpre:h/config.h.in" ;;
"lsp/config.lsp.in" ) CONFIG_FILES="$CONFIG_FILES lsp/config.lsp.in:lsp/config.lsp.in" ;;
"compile.lsp.in" ) CONFIG_FILES="$CONFIG_FILES compile.lsp.in:compile.lsp.in" ;;
"lsp/config.pre" ) CONFIG_FILES="$CONFIG_FILES lsp/config.pre:lsp/config.lsp.in" ;;
"compile.pre" ) CONFIG_FILES="$CONFIG_FILES compile.pre:compile.lsp.in" ;;
"h/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS h/config.h:h/configpre" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

9
src/configure.in
View file

@ -363,13 +363,12 @@ dnl
dnl Notice that we build ${builddir}/h/configpre.h fron ${srcdir}/h/config.h.in,
dnl and then use all AC_DEF* to build h/config.h from h/configpre.h
dnl
AC_CONFIG_FILES(bare.lsp
lsp/config.lsp cmp/cmpcfg.lsp lsp/load.lsp clos/load.lsp cmp/load.lsp
AC_CONFIG_FILES(bare.lsp cmp/cmpcfg.lsp lsp/load.lsp clos/load.lsp cmp/load.lsp
../Makefile Makefile c/Makefile doc/Makefile doc/ecl.man
tk/Makefile tests/Makefile ansi-tests/Makefile gabriel/Makefile)
AC_CONFIG_FILES([ecl-config.in:util/ecl-config])
AC_CONFIG_FILES([ecl-config.pre:util/ecl-config])
AC_CONFIG_FILES([h/configpre:h/config.h.in])
AC_CONFIG_FILES([lsp/config.lsp.in:lsp/config.lsp.in])
AC_CONFIG_FILES([compile.lsp.in:compile.lsp.in])
AC_CONFIG_FILES([lsp/config.pre:lsp/config.lsp.in])
AC_CONFIG_FILES([compile.pre:compile.lsp.in])
AC_CONFIG_HEADER([h/config.h:h/configpre])
AC_OUTPUT

10
src/lsp/config.lsp.in
View file

@ -67,11 +67,9 @@ Returns, as a string, the version of the software under which ECL runs."
;; * Set configuration pathnames. Notice the trailing slash!
;; Otherwise it would not be a directory.
;;
#+(and (not mingw32) (not ecl-min))
#-mingw32
(si::pathname-translations "SYS" '(("**;*.*" "@ecldir@/**/*.*")))
#+(and mingw32 (not ecl-min))
(let ((d (merge-pathnames "**/*.*"
(or (si::getenv "ECLDIR") (si::argv 0)))))
(si::pathname-translations "SYS"
`(("**;*.*" ,d))))
#+mingw32
(si::pathname-translations "SYS"
`(("**;*.*" ,(merge-pathnames "**/*.*" (si::argv 0)))))
(si::pathname-translations "HOME" '(("**;*.*" "~/**/*.*")))