Index: yanfs-0.0.20070825/src/com/sun/gssapi/mechs/dummy/Makefile
===================================================================
--- yanfs-0.0.20070825.orig/src/com/sun/gssapi/mechs/dummy/Makefile	2007-03-20 13:47:41.000000000 +0530
+++ yanfs-0.0.20070825/src/com/sun/gssapi/mechs/dummy/Makefile	2007-08-31 00:39:31.000000000 +0530
@@ -59,7 +59,7 @@
 M4DEF_PROP += -D CRED=_K2102CC5
 
 Dummy.java: Dummy.m4
-	/usr/ccs/bin/m4 $(M4DEF_PROP) Dummy.m4 > Dummy.java 
+	$(M4) $(M4DEF_PROP) Dummy.m4 > Dummy.java 
 
 # Service Provider Interface Context Class and its methods/interface
 M4DEF_CTXTSPI = -D GSSCtxtSpi=C018FE95
@@ -86,5 +86,5 @@
 M4DEF_CTXTSPI += -D _dispose=_S020B957
 
 DummyCtxt.java: DummyCtxt.m4
-	/usr/ccs/bin/m4 $(M4DEF_CTXTSPI) DummyCtxt.m4 > DummyCtxt.java
+	$(M4) $(M4DEF_CTXTSPI) DummyCtxt.m4 > DummyCtxt.java
 
Index: yanfs-0.0.20070825/src/com/sun/Makefile.common
===================================================================
--- yanfs-0.0.20070825.orig/src/com/sun/Makefile.common	2007-03-20 13:47:34.000000000 +0530
+++ yanfs-0.0.20070825/src/com/sun/Makefile.common	2007-08-31 00:39:31.000000000 +0530
@@ -35,7 +35,14 @@
 # nuclear facility.
 #
 
-include $(CODEMGR_WS)/src/com/sun/Makefile.defs
+CDIR=		$(CODEMGR_WS)/classes
+JAVADIR=	/usr/java
+CLASSPATH=	$(CDIR):$(JAVADIR)/lib/classes.zip
+JCFLAGS=	-classpath $(CLASSPATH)
+JC=		$(JAVADIR)/bin/javac
+TFILE=		$(CDIR)/$(PKGDIR)/.tfile
+M4=		/usr/bin/m4
+
 
 # XXX
 #SWINGDIR, BEANCLASSPATH, JCBFLAGS need to be removed once JDK1.2 is FCS.
Index: yanfs-0.0.20070825/src/com/sun/nfs/XFileAccessor.java
===================================================================
--- yanfs-0.0.20070825.orig/src/com/sun/nfs/XFileAccessor.java	2007-03-20 13:47:44.000000000 +0530
+++ yanfs-0.0.20070825/src/com/sun/nfs/XFileAccessor.java	2007-08-31 00:39:31.000000000 +0530
@@ -71,7 +71,7 @@
             return true;
         } catch (IOException e) {
             return false;
-        };
+        }
     }
 
     public XFile getXFile() {
Index: yanfs-0.0.20070825/src/com/sun/xfile/XFile.java
===================================================================
--- yanfs-0.0.20070825.orig/src/com/sun/xfile/XFile.java	2007-03-20 13:47:47.000000000 +0530
+++ yanfs-0.0.20070825/src/com/sun/xfile/XFile.java	2007-08-31 00:39:31.000000000 +0530
@@ -391,7 +391,7 @@
         } catch (Exception e) {
             System.out.println("Error: makenative:" + f.getPath());
             return null;
-        };
+        }
     }
 
 
Index: yanfs-0.0.20070825/src/com/sun/Makefile.defs
===================================================================
--- yanfs-0.0.20070825.orig/src/com/sun/Makefile.defs	2007-08-31 00:42:28.000000000 +0530
+++ yanfs-0.0.20070825/src/com/sun/Makefile.defs	2007-08-31 00:42:34.000000000 +0530
@@ -41,4 +41,4 @@
 JCFLAGS=	-classpath $(CLASSPATH)
 JC=		$(JAVADIR)/bin/javac
 TFILE=		$(CDIR)/$(PKGDIR)/.tfile
-M4=		/usr/ccs/bin/m4
+M4=		/usr/bin/m4