Merge branch 'master' of pwrcvs:/data1/git/pwr

java/jpwr/jop/src/JopLang.java

@@ -347,7 +347,7 @@ public class JopLang {
 	    if ( i == 0 && btree_en_us != null)
 		continue;
 	
-	    if ( root != null && root instanceof JopApplet) {
+	    if ( root != null && root instanceof JApplet) {
 	      try {
 		URL current = ((JApplet) root).getCodeBase();
 		String current_str = current.toString();

java/jpwr/jop/src/os_linux/hw_x86/makefile

@@ -15,9 +15,9 @@ local_java_sources := \
 	JopUtilityIfc.java \
 	JopUtility.java \
 	JopSession.java \
+	JopLang.java \
 	JopMethods.java \
 	JopMethodsMenu.java \
-	JopLang.java \
 	JopConfirm.java \
 	JopConfirmDialog.java \
 	JopFrame.java \

src/tools/pwre/src/os_linux/pwre.pl

@@ -220,6 +220,7 @@ sub build_kernel # args: flavour
   _module("otherio");
   _build("exp","rt","src","copy");
   _build("lib","usbio_dummy","src","init lib");
+  _build("lib","usb_dummy","src","init lib");
   merge();
   _module("xtt");
   build_all("exe", $flavour);
@@ -325,6 +326,7 @@ sub ebuild # args: pass flavour
     _module("otherio");
     _build("exp","rt","src","copy");
     _build("lib","usbio_dummy","src","init lib");
+    _build("lib","usb_dummy","src","init lib");
     merge();
     _module("rt");
     _build("exe", "rt*", "src", "all");