aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README-hacking2
-rw-r--r--gamma/Makefile.am4
-rwxr-xr-xscripts/bootstrap8
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
@@ -12,7 +12,7 @@ latest stable version.
12- Automake <http://www.gnu.org/software/automake/> 12- Automake <http://www.gnu.org/software/automake/>
13- Autoconf <http://www.gnu.org/software/autoconf/> 13- Autoconf <http://www.gnu.org/software/autoconf/>
14 14
15Of course, you will also need Guile version 1.8 or later: 15Of course, you will also need Guile version 2.2 or later:
16 16
17- Guile <http://www.gnu.org/software/guile> 17- Guile <http://www.gnu.org/software/guile>
18 18
diff --git a/gamma/Makefile.am b/gamma/Makefile.am
index de3a868..e4ddfc1 100644
--- a/gamma/Makefile.am
+++ b/gamma/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST += loader.sci
32GAMMA_BUILT_DATA_FILES += loader.scm 32GAMMA_BUILT_DATA_FILES += loader.scm
33 33
34sitedir=$(GUILE_SITE)/$(PACKAGE) 34sitedir=$(GUILE_SITE)/$(PACKAGE)
35site_DATA=$(GAMMA_DATA_FILES) documentation.scm 35site_DATA=$(GAMMA_DATA_FILES) $(GAMMA_BUILT_DATA_FILES) documentation.scm
36 36
37.sci.scm: 37.sci.scm:
38 $(AM_V_GEN)m4 -DVERSION=$(VERSION) -DLIBDIR=$(libdir) \ 38 $(AM_V_GEN)m4 -DVERSION=$(VERSION) -DLIBDIR=$(libdir) \
@@ -44,7 +44,7 @@ DOT_DOC_FILES=$(DOT_X_FILES:.x=.doc)
44DISTCLEANFILES=$(site_DATA) 44DISTCLEANFILES=$(site_DATA)
45 45
46SUFFIXES= 46SUFFIXES=
47CLEANFILES= 47CLEANFILES=$(GAMMA_BUILT_DATA_FILES)
48BUILT_SOURCES= 48BUILT_SOURCES=
49include ../gint/gint.mk 49include ../gint/gint.mk
50 50
diff --git a/scripts/bootstrap b/scripts/bootstrap
index 9a38489..f1a84e3 100755
--- a/scripts/bootstrap
+++ b/scripts/bootstrap
@@ -437,7 +437,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cons \"$0\" (cdr (command-line))))"
437 (cond 437 (cond
438 ((assoc-ref moddef 'scm) => 438 ((assoc-ref moddef 'scm) =>
439 (lambda (scm-list) 439 (lambda (scm-list)
440 (let ((built-data '())) 440 (let ((built-data '())
441 (scm-data '()))
441 (format #t "EXTRA_DIST +=") 442 (format #t "EXTRA_DIST +=")
442 (for-each 443 (for-each
443 (lambda (file) 444 (lambda (file)
@@ -445,12 +446,13 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cons \"$0\" (cdr (command-line))))"
445 (set! built-data (cons (string-append 446 (set! built-data (cons (string-append
446 (string-drop-right file 1) 447 (string-drop-right file 1)
447 "m") 448 "m")
448 built-data))) 449 built-data))
450 (set! scm-data (cons file scm-data)))
449 (display " ") 451 (display " ")
450 (display file)) 452 (display file))
451 scm-list) 453 scm-list)
452 (newline) 454 (newline)
453 (format #t "GAMMA_DATA_FILES += ~a~%" (string-join scm-list " ")) 455 (format #t "GAMMA_DATA_FILES += ~a~%" (string-join scm-data " "))
454 456
455 (cond 457 (cond
456 ((not (null? built-data)) 458 ((not (null? built-data))

Return to:

Send suggestions and report system problems to the System administrator.