summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2018-09-21 10:16:51 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2018-09-21 10:16:51 (GMT)
commit20b3e2126d704153c9524a2584981ceabc419b0a (patch) (side-by-side diff)
treeeb0f78d9e1464d8589f31577da37841e0f76b719
parentaceb6ae2a22b00e4e8438a538a1cd6784fbe24d0 (diff)
downloadgamma-20b3e2126d704153c9524a2584981ceabc419b0a.tar.gz
gamma-20b3e2126d704153c9524a2584981ceabc419b0a.tar.bz2
Minor fixesHEADmaster
Diffstat (more/less context) (ignore whitespace changes)
-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.
- 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>
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
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) \
@@ -44,7 +44,7 @@ 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
@@ -437,7 +437,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cons \"$0\" (cdr (command-line))))"
(cond
((assoc-ref moddef 'scm) =>
(lambda (scm-list)
- (let ((built-data '()))
+ (let ((built-data '())
+ (scm-data '()))
(format #t "EXTRA_DIST +=")
(for-each
(lambda (file)
@@ -445,12 +446,13 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cons \"$0\" (cdr (command-line))))"
(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))

Return to:

Send suggestions and report system problems to the System administrator.