[PVFS2-CVS] commit by neill in pvfs2: ChangeLog Makefile.in

[CVS commit program]

Update of /projects/cvsroot/pvfs2
In directory parlweb:/tmp/cvs-serv8209

Modified Files:
      Tag: pvfs2-nm-nb-branch
	ChangeLog Makefile.in 
Log Message:
- pull mainline changes into this branch


Index: ChangeLog
===================================================================
RCS file: /projects/cvsroot/pvfs2/ChangeLog,v
diff -p -u -r1.91 -r1.91.2.1
--- ChangeLog	8 Jun 2004 21:31:34 -0000	1.91
+++ ChangeLog	7 Jul 2004 20:30:50 -0000	1.91.2.1
@@ -5,7 +5,7 @@ PVFS2 Release ChangeLog
 
 pvfs2-0.6.0pre1
 ===============
-- 
+- kill pvfs2-import and pvfs2-export in favor of pvfs2-cp 
 
 
 pvfs2-0.5.1

Index: Makefile.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/Makefile.in,v
diff -p -u -r1.157.2.4 -r1.157.2.5
--- Makefile.in	24 Jun 2004 17:16:11 -0000	1.157.2.4
+++ Makefile.in	7 Jul 2004 20:30:50 -0000	1.157.2.5
@@ -729,7 +729,7 @@ docs: $(DOCSPS) $(DOCSPDF) $(DOCSHTML)
 # latex2html puts all its output in a directory
 docsclean: 
 	rm -f $(DOCSPS) $(DOCSPDF) $(DOCSCRUFT)
-	rm -rf $(basename $DOCSHTML)
+	rm -rf $(basename $(DOCSHTML))
 
 # top rule for cleaning up tree
 clean::