--- jogl-1.1.1.orig/gluegen/make/build.xml	2008-05-14 18:54:48.000000000 +0200
+++ jogl-1.1.1/gluegen/make/build.xml	2008-12-29 11:41:54.000000000 +0100
@@ -222,11 +222,6 @@
       <property name="java.includes.dir.platform"           value="${java.includes.dir}/win32" />
     </target>
 
-    <target name="declare.linux.x86" if="isLinuxX86">
-      <echo message="Linux.x86" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
-      <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
-    </target>
     
     <target name="declare.linux.amd64" if="isLinuxAMD64">
       <echo message="Linux.AMD64" />
@@ -239,8 +234,17 @@
       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
       <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
     </target>
+    
+    <target name="declare.linux.ppc" if="isLinuxPPC">
+      <echo message="Linux.ppc" />
+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
+      <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
+    </target>
 
-    <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64" if="isLinux" >
+    <target name="declare.linux" if="isLinux" >
+      <echo message="Linux" />
+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
+      <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
       <property name="c.src.dir"                            value="unix" />
       <property name="java.includes.dir.platform"           value="${java.includes.dir}/linux" />
     </target>
--- jogl-1.1.1.orig/gluegen/make/gluegen-cpptasks.xml	2008-02-08 20:47:30.000000000 +0100
+++ jogl-1.1.1/gluegen/make/gluegen-cpptasks.xml	2008-12-29 11:41:54.000000000 +0100
@@ -36,6 +36,7 @@
    -   isLinuxAMD64
    -   isLinuxIA64
    -   isLinuxX86
+   -   isLinuxPPC
    -   isOSX
    -   isOSXPPC
    -   isOSXUniversal (if macosxfat=true)
@@ -161,33 +162,6 @@
     <condition property="isHPUX">
       <os name="HP-UX" />
     </condition>
-    <condition property="isLinuxX86">
-      <and>
-        <istrue value="${isLinux}" />
-        <or>
-          <os arch="i386" />
-          <os arch="x86" />
-        </or>
-      </and>
-    </condition>
-    <condition property="isLinuxAMD64">
-      <and>
-        <istrue value="${isLinux}" />
-        <or>
-          <os arch="AMD64" />
-          <os arch="x86_64" />
-        </or>
-      </and>
-    </condition>
-    <condition property="isLinuxIA64">
-      <and>
-        <istrue value="${isLinux}" />
-        <os arch="IA64" />
-      </and>
-    </condition>
-    <condition property="isIA64">
-      <os arch="IA64" />
-    </condition>
     <condition property="isSolaris32Bit">
       <and>
          <istrue value="${isSolaris}" />
@@ -238,9 +212,7 @@
     <echo message="HPUX=${isHPUX}" />
     <echo message="IA64=${isIA64}" />
     <echo message="Linux=${isLinux}" />
-    <echo message="LinuxAMD64=${isLinuxAMD64}" />
-    <echo message="LinuxIA64=${isLinuxIA64}" />
-    <echo message="LinuxX86=${isLinuxX86}" />
+    <echo message="Arch=${os.arch}" />
     <echo message="OS X=${isOSX}" />
     <echo message="Solaris=${isSolaris}" />
     <echo message="Solaris32Bit=${isSolaris32Bit}" />
@@ -261,20 +233,10 @@
     <property name="os.and.arch" value="hpux-hppa" />
   </target>
 
-  <target name="gluegen.cpptasks.detect.os.linux.amd64" unless="gluegen.cpptasks.detected.os" if="isLinuxAMD64">
-    <property name="os.and.arch" value="linux-amd64" />
+  <target name="gluegen.cpptasks.detect.os.linux" unless="gluegen.cpptasks.detected.os" if="isLinux">
+    <property name="os.and.arch" value="linux-all" />
   </target>
 
-  <target name="gluegen.cpptasks.detect.os.linux.ia64" unless="gluegen.cpptasks.detected.os" if="isLinuxIA64">
-    <property name="os.and.arch" value="linux-ia64" />
-  </target>
-
-  <target name="gluegen.cpptasks.detect.os.linux.x86" unless="gluegen.cpptasks.detected.os" if="isLinuxX86">
-    <property name="os.and.arch" value="linux-i586" />
-  </target>
-
-  <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86" unless="gluegen.cpptasks.detected.os" />
-
   <target name="gluegen.cpptasks.detect.os.osx.ppc" unless="gluegen.cpptasks.detected.os" if="isOSXPPC">
     <property name="os.and.arch" value="macosx-ppc" />
   </target>
--- jogl-1.1.1.orig/jogl/make/build.xml	2008-04-29 17:18:50.000000000 +0200
+++ jogl-1.1.1/jogl/make/build.xml	2008-12-29 11:58:59.000000000 +0100
@@ -210,8 +210,10 @@
         <property name="java.includes.dir.freebsd" value="${java.includes.dir}/freebsd" />
         <property name="java.includes.dir.hpux" value="${java.includes.dir}/hp-ux" />
         <property name="java.lib.dir.win32" value="${java.home.dir}/lib" />
-        <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/i386" />
+        <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/${os.arch}/" />
+<!--        <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/i386" />-->
         <property name="java.lib.dir.linux.amd64" value="${java.home.dir}/jre/lib/amd64" />
+        <property name="java.lib.dir.linux.ppc" value="${java.home.dir}/jre/lib/ppc" />
         <property name="java.lib.dir.linux.ia64" value="${java.home.dir}/jre/lib/ia64" />
         <property name="java.lib.dir.hpux" value="${java.home.dir}/jre/lib/PA_RISC2.0" />
 	<condition property="cpu" value="sparc">
@@ -369,6 +371,15 @@
       <property name="linker.cfg.id.core"                   value="linker.cfg.linux.amd64.jogl" /> 
     </target>
     
+    <target name="declare.linux" if="isLinux">
+      <echo message="Linux" />
+      <property name="java.includes.dir.platform"           value="${java.includes.dir.linux}" />
+      <property name="java.lib.dir.platform"                value="${java.lib.dir.linux}" />       
+
+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
+      <property name="linker.cfg.id.core"                   value="linker.cfg.linux.jogl" /> 
+    </target>
+
     <target name="declare.linux.ia64" if="isLinuxIA64">
       <echo message="Linux.IA64" />
       <property name="java.includes.dir.platform"           value="${java.includes.dir.linux}" />
@@ -378,7 +389,6 @@
       <property name="linker.cfg.id.core"                   value="linker.cfg.linux.jogl" /> 
     </target>
 
-    <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.x11" if="isLinux" />
 
     <target name="declare.solaris32" depends="declare.x11" if="isSolaris32Bit">
       <echo message="Solaris" />
@@ -727,20 +737,19 @@
       <compiler id="compiler.cfg.freebsd.jogl" extends="compiler.cfg.freebsd">
         <!-- Need to force X11R6 headers on to include path after stub_includes -->
         <includepath path="stub_includes/opengl"/>
-        <includepath path="/usr/X11R6/include" />
       </compiler>
 
       <!-- linker configuration -->
  
       <linker id="linker.cfg.linux.jogl" extends="linker.cfg.linux">
-        <syslibset dir="/usr/X11R6/lib" libs="GL, X11"/>
-        <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" />
+        <syslibset libs="GL, X11"/>
+        <syslibset libs="Xxf86vm" />
         <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
       </linker>
 
       <linker id="linker.cfg.linux.amd64.jogl" name="gcc">
-        <syslibset dir="/usr/X11R6/lib64" libs="GL, X11"/>
-        <syslibset dir="/usr/X11R6/lib64" libs="Xxf86vm" />
+        <syslibset libs="GL, X11"/>
+        <syslibset libs="Xxf86vm" />
         <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
       </linker>
 
@@ -1018,6 +1027,7 @@
                  destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}" 
                  source="1.4"
+				classpath="${gluegen.jar}"
                  linkoffline="${javadoc.link} 142-packages"
 		 bottom="${javadoc.bottom}" >
           <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />