diff options
| author | Sergey Poznyakoff <gray@gnu.org> | 2018-09-10 09:48:11 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org> | 2018-09-10 09:48:11 +0300 |
| commit | aceb6ae2a22b00e4e8438a538a1cd6784fbe24d0 (patch) | |
| tree | 1fab2a832f8f35eb9c48af0c520ab8132db7fdb9 | |
| parent | 30a8ad498d4aef9a85a8e68f9409dc90e86cc857 (diff) | |
| download | gamma-aceb6ae2a22b00e4e8438a538a1cd6784fbe24d0.tar.gz gamma-aceb6ae2a22b00e4e8438a538a1cd6784fbe24d0.tar.bz2 | |
Fix make install
* gamma/Makefile.am (site_DATA): Install GAMMA_DATA_FILES
* gamma/gamma-expat.c (gamma_xml_parser_free): Don't free gp
(allocated using scm_gc_malloc
* scripts/bootstrap: Define GAMMA_DATA_FILES to contain
names of all files to be installed in Guile site directory.
| -rw-r--r-- | gamma/Makefile.am | 2 | ||||
| -rw-r--r-- | gamma/gamma-expat.c | 1 | ||||
| -rwxr-xr-x | scripts/bootstrap | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/gamma/Makefile.am b/gamma/Makefile.am index 34df836..de3a868 100644 --- a/gamma/Makefile.am +++ b/gamma/Makefile.am @@ -29,13 +29,13 @@ MAINTAINERCLEANFILES= include modules.mk EXTRA_DIST += loader.sci GAMMA_BUILT_DATA_FILES += loader.scm sitedir=$(GUILE_SITE)/$(PACKAGE) -site_DATA=$(GAMMA_BUILT_DATA_FILES) documentation.scm +site_DATA=$(GAMMA_DATA_FILES) documentation.scm .sci.scm: $(AM_V_GEN)m4 -DVERSION=$(VERSION) -DLIBDIR=$(libdir) \ -DBUILDDIR="`pwd`" -DSITEDIR='$(sitedir)' $< > $@ DOT_X_FILES=$(GAMMA_X_FILES) diff --git a/gamma/gamma-expat.c b/gamma/gamma-expat.c index cd3efaa..eb9fb1c 100644 --- a/gamma/gamma-expat.c +++ b/gamma/gamma-expat.c @@ -47,13 +47,12 @@ gamma_xml_parser_free(SCM smob) if (gp->parser) { struct gamma_expat_user_data *udata = XML_GetUserData(gp->parser); free(udata); XML_ParserFree(gp->parser); } - free(gp); return 0; } static SCM gamma_xml_parser_mark(SCM smob) { diff --git a/scripts/bootstrap b/scripts/bootstrap index 5d9d3eb..9a38489 100755 --- a/scripts/bootstrap +++ b/scripts/bootstrap @@ -386,12 +386,13 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cons \"$0\" (cdr (command-line))))" progname makefile) (with-output-to-file-p makefile (lambda () (write-autogenerated-header "# " #f) (newline) + (display "GAMMA_DATA_FILES=\n") (display "GAMMA_BUILT_DATA_FILES=\n") (display "GAMMA_X_FILES=\n") (for-each (lambda (moddef) (write-module-header "Module ~A" moddef) @@ -446,13 +447,14 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cons \"$0\" (cdr (command-line))))" "m") built-data))) (display " ") (display file)) scm-list) (newline) - + (format #t "GAMMA_DATA_FILES += ~a~%" (string-join scm-list " ")) + (cond ((not (null? built-data)) (format #t "GAMMA_BUILT_DATA_FILES +=") (for-each (lambda (file) (display " ") |