Make the default library directories configurable by
--with-lib-dirs-list and let it default to $prefix/lib/scsh/modules.
This commit is contained in:
parent
f376ab6d8e
commit
ca97d21195
|
@ -29,6 +29,7 @@ libdir = @libdir@
|
|||
incdir = @includedir@
|
||||
manext = 1
|
||||
mandir = @mandir@/man$(manext)
|
||||
lib_dirs_list = @lib_dirs_list@
|
||||
### End of `configure' section###
|
||||
|
||||
htmldir = $(libdir)/scsh/doc/scsh-manual/html
|
||||
|
@ -901,12 +902,14 @@ install-scsh: scsh install-scsh-image install-stripped-scsh-image
|
|||
|
||||
install-scsh-image: $(VM) scsh/scsh.image
|
||||
( echo ',translate =scheme48 $(LIB)'; \
|
||||
echo ',in scsh-top-package (set-default-lib-dirs! (quote $(lib_dirs_list)))'; \
|
||||
echo '(dump-scsh "$(DESTDIR)$(LIB)/scsh.image")'; \
|
||||
echo ',exit'; \
|
||||
) | ./$(VM) -i scsh/scsh.image
|
||||
|
||||
install-stripped-scsh-image: $(VM) scsh/stripped-scsh.image
|
||||
( echo ',translate =scheme48 $(LIB)'; \
|
||||
echo ',in scsh-top-package (set-default-lib-dirs! (quote $(lib_dirs_list)))'; \
|
||||
echo '(dump-scsh "$(DESTDIR)$(LIB)/stripped-scsh.image")'; \
|
||||
echo ',exit'; \
|
||||
) | ./$(VM) -i scsh/stripped-scsh.image
|
||||
|
|
|
@ -363,6 +363,14 @@ fail
|
|||
SCSH_CONST_SYS_ERRLIST
|
||||
CFLAGS1=${CFLAGS}
|
||||
|
||||
lib_dirs_list=\(\"$prefix/lib/scsh/modules\"\)
|
||||
AC_ARG_WITH(lib-dirs-list,
|
||||
AC_HELP_STRING([--with-lib-dirs-list],
|
||||
[list of default scsh library directories (default ("$prefix/lib/scsh/modules"))]),
|
||||
lib_dirs_list="$withval")
|
||||
|
||||
AC_SUBST(lib_dirs_list)
|
||||
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
|
||||
|
|
|
@ -181,7 +181,12 @@
|
|||
|
||||
(values (reverse switches) #f #f top-entry '()))))
|
||||
|
||||
(define default-lib-dirs '("/usr/local/lib/scsh/modules/"))
|
||||
(define default-lib-dirs 'unset-default-lib-dirs)
|
||||
|
||||
(define (set-default-lib-dirs! path-list)
|
||||
(set! default-lib-dirs path-list))
|
||||
|
||||
; '("/usr/local/lib/scsh/modules/"))
|
||||
|
||||
;;; Do each -ds, -dm, -de, -o, -n, -m, -l/lm/ll, +lp/+lpe/lp+/lpe+, or
|
||||
;;; -lp-clear/lp-default switch, and return the final result package and a
|
||||
|
|
Loading…
Reference in New Issue