diff -up clapham-0.1.003/build.xml.libdir clapham-0.1.003/build.xml
--- clapham-0.1.003/build.xml.libdir	2011-01-09 01:15:39.000000000 -0800
+++ clapham-0.1.003/build.xml	2011-01-09 01:18:40.000000000 -0800
@@ -20,6 +20,9 @@
 <!--
   == Changes by <eric@brouhaha.com> for Fedora RPM build:
   ==   All references to Ivy removed
+  ==   added javacc.dir and batik.dir properties and used in classpath
+  ==   javacchome set to javacc.dir
+  ==   jar build in top directory rather than lib.dir
 -->
 <project name="clapham" default="compile">
     <property environment="env"/>
@@ -37,6 +40,8 @@
     <property name="testclasses.dir" location="${basedir}/testclasses"/>
     <property name="javadoc.dir" value="doc/api"/>
     <property name="javadoc.location" value="${project.location}/doc/api"/>
+    <property name="javacc.dir" value="/usr/share/java"/>
+    <property name="batik.dir" value="/usr/share/java/batik"/>
     <property name="lib.dir" value="lib"/>
     <property name="lib.location" location="${project.location}/lib"/>
     <property name="testlib.dir" value="testlib"/>
@@ -46,11 +51,11 @@
     <property name="project.build.debug" value="on"/>
 
     <path id="project.classpath">
-        <pathelement location="${lib.dir}/javacc.jar"/>
-        <pathelement location="${lib.dir}/batik-svggen.jar"/>
-        <pathelement location="${lib.dir}/batik-awt-util.jar"/>
-        <pathelement location="${lib.dir}/batik-transcoder.jar"/>
-        <pathelement location="${lib.dir}/batik-util.jar"/>
+        <pathelement location="${javacc.dir}/javacc.jar"/>
+        <pathelement location="${batik.dir}/batik-svggen.jar"/>
+        <pathelement location="${batik.dir}/batik-awt-util.jar"/>
+        <pathelement location="${batik.dir}/batik-transcoder.jar"/>
+        <pathelement location="${batik.dir}/batik-util.jar"/>
         <pathelement location="${ant.home}/lib/ant.jar"/>
         <pathelement location="${ant.home}/lib/optional.jar"/>
     </path>
@@ -67,13 +72,13 @@
     <target name="wirth-parser">
         <javacc
                 target="src/net/hydromatic/clapham/parser/wirth/WirthParser.jj"
-                javacchome="${basedir}/lib"/>
+                javacchome="${javacc.dir}"/>
     </target>
 
     <target name="bnf-parser">
         <javacc
                 target="src/net/hydromatic/clapham/parser/bnf/BnfParser.jj"
-                javacchome="${basedir}/lib"/>
+                javacchome="${javacc.dir}"/>
     </target>
 
     <target name="prepare">
@@ -109,7 +114,7 @@ Vendor: ${vendor}
 
     <target name="jar" depends="compile,version"
             description="Jars up the bin directory after a compile">
-        <jar destfile="${lib.dir}/${project.name}.jar">
+        <jar destfile="${project.name}.jar">
             <zipfileset dir="${classes.dir}" prefix="" includes="**/*"/>
             <zipfileset dir="${basedir}" prefix=""
                         includes="