From dfd3c3b8097a95db25a803be993bbe469206941b Mon Sep 17 00:00:00 2001
From: Theresa Windus <twindus@iastate.edu>
Date: Sat, 4 Nov 2000 00:18:02 +0000
Subject: [PATCH] Small fixes to update utility.

---
 contrib/mov2asc/Makefile  | 8 ++++----
 contrib/mov2asc/README    | 6 +++---
 contrib/mov2asc/asc2mov.F | 9 +++------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/contrib/mov2asc/Makefile b/contrib/mov2asc/Makefile
index 1cef0ad3f4..00a1abbfbd 100644
--- a/contrib/mov2asc/Makefile
+++ b/contrib/mov2asc/Makefile
@@ -1,5 +1,5 @@
 # Makefile for movecs <--> ASCII translators
-# $Id: Makefile,v 1.3 1997-04-01 22:26:12 rg240 Exp $
+# $Id: Makefile,v 1.4 2000-11-04 00:18:02 windus Exp $
 
 # Tested on KSR, Cray-T3D
 # Requires NWCHEM_TARGET to be set.
@@ -23,11 +23,11 @@ ifeq ($(NWCHEM_TARGET),IBM)
 endif
 
 ifeq ($(NWCHEM_TARGET),IBM)
-   CPPFLAGS = -WF,"-I../../src/include"			# Needs MA includes
+   CPPFLAGS = -WF,"-I../../src/tools/include"		# Needs MA includes
 else
-   CPPFLAGS = -I../../src/include			# Needs MA includes
+   CPPFLAGS = -I../../src/tools/include			# Needs MA includes
 endif
-LDFLAGS = -L../../lib/${NWCHEM_TARGET} -lutil	# Needs MA library
+LDFLAGS = -L../../src/tools/lib/${NWCHEM_TARGET} -lma	# Needs MA library
 
 all:    mov2asc asc2mov
 
diff --git a/contrib/mov2asc/README b/contrib/mov2asc/README
index 1ec23198f4..3b2a8fc949 100644
--- a/contrib/mov2asc/README
+++ b/contrib/mov2asc/README
@@ -1,11 +1,11 @@
-$Id: README,v 1.1 1995-06-02 04:16:29 gg502 Exp $
+$Id: README,v 1.2 2000-11-04 00:18:02 windus Exp $
 
 This is a pair of programs that translate between NWChem movecs files
 in the usual binary format and an ASCII form that can be moved to
-abother platform and converted back into a binary file for that
+another platform and converted back into a binary file for that
 machine.  They are quite simple, and don't do much error checking, but
 they seem to work.
 
-Known to work on KSR, Cray-T3D.
+Known to work on Sun and SGI
 Requires NWChem's include files and libutil.a containing the MA
 library.
diff --git a/contrib/mov2asc/asc2mov.F b/contrib/mov2asc/asc2mov.F
index 26b6732139..935e284fec 100644
--- a/contrib/mov2asc/asc2mov.F
+++ b/contrib/mov2asc/asc2mov.F
@@ -1,14 +1,14 @@
       Program asc2mov
       Implicit NONE
 C
-C     Writes formatted (ASCII) movecs file, reads binary version
+C     Reads formatted (ASCII) movecs file, writes binary version
 C
 C     Usage: asc2mov guess_nbf infile outfile
 C
 C     guess_nbf must be at least as large as the NBF in the file to be
 C     translated.
 C
-C     $Id: asc2mov.F,v 1.3 1997-04-01 22:26:13 rg240 Exp $
+C     $Id: asc2mov.F,v 1.4 2000-11-04 00:18:02 windus Exp $
 C
 #include "mafdecls.fh"
 c
@@ -39,7 +39,7 @@ C     Interpret command line
 C
       NArgs = IArgc()
       If ( NArgs .ne. 3) then
-         Write (0, *) 'Usage: mov2asc guess_nbf infile outfile'
+         Write (0, *) 'Usage: asc2mov guess_nbf infile outfile'
          Call Exit(1)
       EndIf
 #ifdef _CRAY
@@ -71,15 +71,12 @@ c
       read(asclu,'(a32)') geomsum
       read(asclu,'(a20)') scftype20
       read(asclu,'(a26)') date
-      read(asclu, *) 
       write(binlu) basissum, geomsum, scftype20, date
 c
       read(asclu,'(a20)') scftype20
       write(binlu) scftype20
 C
       read(asclu, '(I10)') LenTit
-      if (len(title) .lt. lentit) call errquit
-     $   ('movecs_write_header: title too short', lentit)
       write(binlu) lentit
 C
       title = ' '