mirror of
https://gitlab.com/embeddable-common-lisp/ecl.git
synced 2025-12-31 23:00:54 -08:00
ecl-config must also be built using the Makefile
This commit is contained in:
parent
82ab667354
commit
1b45538191
4 changed files with 14 additions and 15 deletions
|
|
@ -40,7 +40,7 @@ LIBRARIES = @LIBRARIES@
|
|||
LSP_LIBRARIES = @LSP_LIBRARIES@
|
||||
TARGETS = @TARGETS@
|
||||
|
||||
all: $(TARGETS) doc
|
||||
all: $(TARGETS) ecl-config doc
|
||||
.PHONY: all
|
||||
|
||||
%Makefile: $(srcdir)/%Makefile.in config.status
|
||||
|
|
@ -67,6 +67,12 @@ 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
|
||||
sed -e 's,~A,$(libdir),;s,~\*,,' \
|
||||
-e 's,@libdir\\@,$(libdir),' \
|
||||
-e 's,@includedir\\@,$(libdir)/h,' ecl-config.in > ecl-config
|
||||
|
||||
|
||||
@LIBPREFIX@ecl.@LIBEXT@: @LIBPREFIX@gmp.@LIBEXT@ @LIBPREFIX@gc.@LIBEXT@ lsp/config.lsp
|
||||
cd c; $(MAKE)
|
||||
@LIBPREFIX@gc.@LIBEXT@:
|
||||
|
|
@ -90,11 +96,8 @@ install-base:
|
|||
$(mkinstalldirs) $(bindir) $(libdir)/h
|
||||
for i in $(TARGETS); do \
|
||||
$(INSTALL) -s $$i $(bindir); \
|
||||
done
|
||||
$(INSTALL_PROGRAM) -s $(TARGETS) $(bindir)
|
||||
sed 's,~A,$(libdir),;s,~\*,,;' ecl-config > foo; \
|
||||
$(INSTALL_PROGRAM) foo $(bindir)/ecl-config; \
|
||||
rm foo
|
||||
done;
|
||||
$(INSTALL_PROGRAM) ecl-config $(bindir)
|
||||
for i in BUILD-STAMP $(LSP_LIBRARIES) $(LIBRARIES) c/dpp* help.doc ; do \
|
||||
$(INSTALL_DATA) $$i $(libdir); \
|
||||
done
|
||||
|
|
|
|||
8
src/configure
vendored
8
src/configure
vendored
|
|
@ -6018,7 +6018,7 @@ 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 ecl-config: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"
|
||||
|
||||
|
|
@ -6567,7 +6567,7 @@ 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" ) CONFIG_FILES="$CONFIG_FILES ecl-config: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" ;;
|
||||
|
|
@ -6935,10 +6935,6 @@ s,@INSTALL@,$ac_INSTALL,;t t
|
|||
rm -f $tmp/out
|
||||
fi
|
||||
|
||||
# Run the commands associated with the file.
|
||||
case $ac_file in
|
||||
ecl-config ) chmod +x ecl-config ;;
|
||||
esac
|
||||
done
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<\_ACEOF
|
||||
|
|
|
|||
|
|
@ -367,7 +367,7 @@ 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([ecl-config:util/ecl-config],[chmod +x ecl-config])
|
||||
AC_CONFIG_FILES([ecl-config.in: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])
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@ for i in $*; do
|
|||
done
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
echo "@CFLAGS@ -I@includedir@"
|
||||
echo "@CFLAGS@ -I@includedir\@"
|
||||
fi
|
||||
|
||||
if test "$echo_ldflags" = "yes"; then
|
||||
echo "@LDRPATH@ -L@libdir@ $LDFLAGS @LDFLAGS@ @CLIBS@"
|
||||
echo "@LDRPATH@ -L@libdir\@ $LDFLAGS @LDFLAGS@ @CLIBS@"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue