3 Don't use cache file to avoid trailing space problem.
4 Fix installation of dynamic modules if they're not built.
6 --- src/makemake.in.orig 2009-09-12 12:23:45.000000000 +0400
7 +++ src/makemake.in 2009-09-12 13:15:02.000000000 +0400
9 RANLIB='@RANLIB@' # either 'ranlib' or ':'
10 INSTALL='@INSTALL@' # either 'install -c' or 'cp'
11 INSTALL_PROGRAM='@INSTALL_PROGRAM@' # either 'install -c' or 'cp'
12 +INSTALL_SCRIPT='@INSTALL_SCRIPT@' # either 'install -c' or 'cp', never 'strip'
13 INSTALL_DATA='@INSTALL_DATA@' # either 'install -c -m 644' or 'cp'
14 GROFF='@GROFF@' # either 'groff' or ''
15 PS2PDF='@PS2PDF@' # either 'ps2pdf' or ''
17 echol "psdir = ${PSDIR}"
18 echol "pdfdir = ${PDFDIR}"
19 echol "libdir = ${LIBDIR}"
20 -echol "lisplibdir = \$(libdir)${NEXT_}\$(TOPDIR)"
21 +echol "lisplibdir = \$(libdir)${NEXT_}clisp"
22 if [ -n "$USE_GETTEXT" ] ; then
23 echol "localedir = ${LOCALEDIR}"
26 echol '# Programs used by "make install":'
27 echol "INSTALL = ${INSTALL}"
28 echol "INSTALL_PROGRAM = ${INSTALL_PROGRAM}"
29 +echol "INSTALL_SCRIPT = ${INSTALL_SCRIPT}"
30 echol "INSTALL_DATA = ${INSTALL_DATA}"
32 echol '# Programs used by "make distrib":'
35 # we must use $(SHELL) for sub-configures because when the top CONFIG_SHELL
36 # is bash, config.cache may be unparsable with sh on Solaris
37 -echotab " \$(SHELL) \$\$m/configure --with-clisp=\"${HEREP}/clisp -K boot ${someflags}\" --cache-file=\$\${cache} --srcdir=\$\$m \$(MODULE_CONFIGURE_FLAGS);\\"
38 +echotab " \$(SHELL) \$\$m/configure --with-clisp=\"${HEREP}/clisp -K boot ${someflags}\" --srcdir=\$\$m \$(MODULE_CONFIGURE_FLAGS);\\"
39 echotab " else \$(SHELL) \$\$m/configure --srcdir=\$\$m \$(MODULE_CONFIGURE_FLAGS); \\"
42 @@ -3621,8 +3623,10 @@
43 echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/build-aux"
44 echotab "for f in ${BUILD_AUX}; do \$(INSTALL_DATA) build-aux/\$\$f \$(DESTDIR)\$(lisplibdir)/build-aux/\$\$f; done"
45 if [ "${with_dynamic_modules}" != no ]; then
46 - echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/dynmod"
47 - echotab "for f in dynmod/*; do \$(INSTALL_DATA) \$\$f \$(DESTDIR)\$(lisplibdir)/\$\$f; done"
48 + echotab "if [ -d dynmod ]; then \\"
49 + echotab " mkdir \$(DESTDIR)\$(lisplibdir)/dynmod; \\"
50 + echotab " for f in dynmod/*; do \$(INSTALL_DATA) \$\$f \$(DESTDIR)\$(lisplibdir)/\$\$f; done; \\"
52 echotab "absdest=\`cd \"\$(DESTDIR)\$(lisplibdir)\"; pwd\` ; \\"
53 echotab "here=\`pwd\`; \\"
54 echotab "for m in \$(MODULES); do \\"
58 echotab "mkdir -p \$(DESTDIR)\$(bindir)"
59 - echotab "\$(INSTALL_PROGRAM) clisp-link \$(DESTDIR)\$(bindir)/clisp-link"
60 + echotab "\$(INSTALL_SCRIPT) clisp-link \$(DESTDIR)\$(bindir)/clisp-link"
61 # Don't strip the executables, otherwise (disassemble #'cons)
62 # and saveinitmem/:executable won't work.
63 # echotab "strip \$(DESTDIR)\$(lisplibdir)/base/lisp${LEXE}"