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.

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
@@ -32,7 +32,7 @@ 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) \
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
@@ -50,7 +50,6 @@ gamma_xml_parser_free(SCM smob)
                 free(udata);
                 XML_ParserFree(gp->parser);
         }
-        free(gp);
         return 0;
 }
 
diff --git a/scripts/bootstrap b/scripts/bootstrap
index 5d9d3eb..9a38489 100755
--- a/scripts/bootstrap
+++ b/scripts/bootstrap
@@ -389,6 +389,7 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cons \"$0\" (cdr (command-line))))"
     (lambda ()
       (write-autogenerated-header "# " #f)
       (newline)
+      (display   "GAMMA_DATA_FILES=\n")
       (display   "GAMMA_BUILT_DATA_FILES=\n")
       (display   "GAMMA_X_FILES=\n")
       (for-each
@@ -449,7 +450,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cons \"$0\" (cdr (command-line))))"
                   (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 +=")