diff --git a/ChangeLog b/ChangeLog
index 262816ab..655c3bcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jul 21 19:10:00 HKT 2002 William Brack <wbrack@mmm.com.hk>
+
+	* xsltInternals.h/xslt.c/transform.c and pattern.c: fixed
+	  a bug reported by Gero Meissner (87230)
+	* fixed a problem compiling python directory when multiple
+	  'make' jobs were executed (python/Makefile.am)
+
 Wed Jul 17 19:58:36 CEST 2002 Daniel Veillard <daniel@veillard.com>
 
 	* libxslt/attributes.c: fixed a bug reported by Keith Isdale
diff --git a/libxslt/pattern.c b/libxslt/pattern.c
index 6314ef98..6085c1ab 100644
--- a/libxslt/pattern.c
+++ b/libxslt/pattern.c
@@ -606,7 +606,7 @@ xsltTestCompMatch(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp,
 		    index = (int)
 			XSLT_RUNTIME_EXTRA(ctxt, select->indexExtra);
 		    list = (xmlXPathObjectPtr)
-			XSLT_RUNTIME_EXTRA(ctxt, select->lenExtra);
+			XSLT_RUNTIME_EXTRA_LST(ctxt, select->lenExtra);
 		    
 		    doc = node->doc;
 		    if ((list == NULL) || (prevdoc != doc)) {
@@ -644,7 +644,7 @@ xsltTestCompMatch(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp,
 				xmlXPathFreeObject(list);
 			    list = newlist;
 
-			    XSLT_RUNTIME_EXTRA(ctxt, select->lenExtra) =
+			    XSLT_RUNTIME_EXTRA_LST(ctxt, select->lenExtra) =
 				(void *) list;
 			    XSLT_RUNTIME_EXTRA(ctxt, select->previousExtra) =
 				(void *) doc;
diff --git a/libxslt/transform.c b/libxslt/transform.c
index c648adfd..9bae626f 100644
--- a/libxslt/transform.c
+++ b/libxslt/transform.c
@@ -263,6 +263,7 @@ xsltNewTransformContext(xsltStylesheetPtr style, xmlDocPtr doc) {
 	for (i = 0;i < cur->extrasMax;i++) {
 	    cur->extras[i].info = NULL;
 	    cur->extras[i].deallocate = NULL;
+	    cur->extras[i].val = NULL;
 	}
     } else {
 	cur->extras = NULL;
diff --git a/libxslt/xslt.c b/libxslt/xslt.c
index 8fa1ae44..e85a88f3 100644
--- a/libxslt/xslt.c
+++ b/libxslt/xslt.c
@@ -397,6 +397,7 @@ xsltAllocateExtraCtxt(xsltTransformContextPtr ctxt)
 	    for (i = 0;i < ctxt->extrasMax;i++) {
 		ctxt->extras[i].info = NULL;
 		ctxt->extras[i].deallocate = NULL;
+		ctxt->extras[i].val = NULL;
 	    }
 
 	} else {
@@ -415,6 +416,7 @@ xsltAllocateExtraCtxt(xsltTransformContextPtr ctxt)
 	    for (i = ctxt->extrasNr;i < ctxt->extrasMax;i++) {
 		ctxt->extras[i].info = NULL;
 		ctxt->extras[i].deallocate = NULL;
+		ctxt->extras[i].val = NULL;
 	    }
 	}
     }
diff --git a/python/Makefile.am b/python/Makefile.am
index 0d651ed4..afc8cd72 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -30,7 +30,7 @@ mylibs = \
 	$(top_builddir)/libxslt/libxslt.la \
 	$(top_builddir)/libexslt/libexslt.la
 
-all: libxslt.py libxsltmod.la
+all-local: libxslt.py
 
 pythondir = $(prefix)/lib/python${PYTHON_VERSION}/site-packages
 python_LTLIBRARIES = libxsltmod.la
@@ -55,8 +55,11 @@ GENERATED= $(srcdir)/libxsltclass.py \
 	   $(srcdir)/libxslt-py.c \
 	   $(srcdir)/libxslt-py.h
 
-$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
+$(GENERATED): gen_prog
+
+gen_prog:  $(srcdir)/$(GENERATE) $(API_DESC)
 	cd $(srcdir) && $(PYTHON) $(GENERATE)
+	touch gen_prog
 
 $(libxsltmod_la_OBJECTS): $(GENERATED)
 
@@ -67,5 +70,5 @@ tests test: all
 	cd tests && $(MAKE) tests
 
 clean:
-	rm -f $(GENERATED) *.o libxslt.so *.pyc libxslt.py
+	rm -f $(GENERATED) *.o libxslt.so *.pyc libxslt.py gen_prog