diff options
| -rw-r--r-- | README-hacking | 2 | ||||
| -rw-r--r-- | gamma/Makefile.am | 4 | ||||
| -rwxr-xr-x | scripts/bootstrap | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/README-hacking b/README-hacking index c208f79..c5365b1 100644 --- a/README-hacking +++ b/README-hacking @@ -9,13 +9,13 @@ packages to build Gamma. I don't make any extra effort to accommodate older versions of these packages, so please make sure that you have the latest stable version. - Automake <http://www.gnu.org/software/automake/> - Autoconf <http://www.gnu.org/software/autoconf/> -Of course, you will also need Guile version 1.8 or later: +Of course, you will also need Guile version 2.2 or later: - Guile <http://www.gnu.org/software/guile> * Bootstrapping Obviously, if you are reading these notes, you did manage to check out diff --git a/gamma/Makefile.am b/gamma/Makefile.am index de3a868..e4ddfc1 100644 --- a/gamma/Makefile.am +++ b/gamma/Makefile.am @@ -29,22 +29,22 @@ MAINTAINERCLEANFILES= include modules.mk EXTRA_DIST += loader.sci GAMMA_BUILT_DATA_FILES += loader.scm sitedir=$(GUILE_SITE)/$(PACKAGE) -site_DATA=$(GAMMA_DATA_FILES) documentation.scm +site_DATA=$(GAMMA_DATA_FILES) $(GAMMA_BUILT_DATA_FILES) documentation.scm .sci.scm: $(AM_V_GEN)m4 -DVERSION=$(VERSION) -DLIBDIR=$(libdir) \ -DBUILDDIR="`pwd`" -DSITEDIR='$(sitedir)' $< > $@ DOT_X_FILES=$(GAMMA_X_FILES) DOT_DOC_FILES=$(DOT_X_FILES:.x=.doc) DISTCLEANFILES=$(site_DATA) SUFFIXES= -CLEANFILES= +CLEANFILES=$(GAMMA_BUILT_DATA_FILES) BUILT_SOURCES= include ../gint/gint.mk diff --git a/scripts/bootstrap b/scripts/bootstrap index 9a38489..f1a84e3 100755 --- a/scripts/bootstrap +++ b/scripts/bootstrap @@ -434,26 +434,28 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cons \"$0\" (cdr (command-line))))" (newline)))) (cond ((assoc-ref moddef 'scm) => (lambda (scm-list) - (let ((built-data '())) + (let ((built-data '()) + (scm-data '())) (format #t "EXTRA_DIST +=") (for-each (lambda (file) (if (string-suffix? ".sci" file) (set! built-data (cons (string-append (string-drop-right file 1) "m") - built-data))) + built-data)) + (set! scm-data (cons file scm-data))) (display " ") (display file)) scm-list) (newline) - (format #t "GAMMA_DATA_FILES += ~a~%" (string-join scm-list " ")) + (format #t "GAMMA_DATA_FILES += ~a~%" (string-join scm-data " ")) (cond ((not (null? built-data)) (format #t "GAMMA_BUILT_DATA_FILES +=") (for-each (lambda (file) |