Index: gnu.readline/Makefile.am
===================================================================
RCS file: /cvs/rhug/rhug/gnu.readline/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- Makefile.am	2001/11/09 05:29:55	1.2
+++ Makefile.am	2002/01/21 12:23:19
@@ -71,7 +71,7 @@
 $(JARFILE): $(CLASSFILES)
 	(cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;)
 	(cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`)
-	(here=`pwd`; cd $(srcdir)/upstream/src; jar uf $$here/$@)
+##	(here=`pwd`; cd $(srcdir)/upstream/src; jar uf $$here/$@)
 
 MOSTLYCLEANFILES = $(JARFILE)
 
Index: gnu.regexp/Makefile.am
===================================================================
RCS file: /cvs/rhug/rhug/gnu.regexp/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- Makefile.am	2001/09/14 01:04:12	1.8
+++ Makefile.am	2002/01/21 12:23:19
@@ -150,7 +150,7 @@
 lib_gnu_regexp_la_DEPENDENCIES = props.o
 
 props.o: $(srcdir)/upstream/src/gnu/regexp/MessagesBundle.properties
-	gcj -fPIC -R gnu/regexp/MessagesBundle.properties -o props.o -c $<
+	$(GCJ) -fPIC -R gnu/regexp/MessagesBundle.properties -o props.o -c $<
 
 lib_gnu_regexp_la_LIBADD = props.o
 
Index: xerces/Makefile.am
===================================================================
RCS file: /cvs/rhug/rhug/xerces/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- Makefile.am	2001/10/23 06:46:49	1.10
+++ Makefile.am	2002/01/21 12:23:19
@@ -842,13 +842,13 @@
 lib_org_apache_xerces_la_DEPENDENCIES = mprops.o mprops_fr.o mprops_ja.o lib-javax-xml-parsers.la lib-org-w3c-dom-html.la lib-org-w3c-dom-events.la
 
 mprops.o: upstream/src/org/apache/xerces/utils/regex/message.properties
-	gcj -fPIC -R org/apache/xerces/utils/regex/message.properties -o $@ -c $<
+	$(GCJ) -fPIC -R org/apache/xerces/utils/regex/message.properties -o $@ -c $<
 
 mprops_fr.o: upstream/src/org/apache/xerces/utils/regex/message_fr.properties
-	gcj -fPIC -R org/apache/xerces/utils/regex/message_fr.properties -o $@ -c $<
+	$(GCJ) -fPIC -R org/apache/xerces/utils/regex/message_fr.properties -o $@ -c $<
 
 mprops_ja.o: upstream/src/org/apache/xerces/utils/regex/message_ja.properties
-	gcj -fPIC -R org/apache/xerces/utils/regex/message_ja.properties -o $@ -c $<
+	$(GCJ) -fPIC -R org/apache/xerces/utils/regex/message_ja.properties -o $@ -c $<
 
 lib_org_apache_xerces_la_LIBADD = mprops.o mprops_fr.o mprops_ja.o -L. -l-javax-xml-parsers -l-org-w3c-dom-html -l-org-w3c-dom-events