[patch] patch_annie.diff

patch_annie.diff (text/plain), 3.13 KB, created by Tim Cera on 2006-03-24 19:36:04 UTC

diff -ur annie4.1/msg/wdimex.sh annie4.1.new/msg/wdimex.sh
--- annie4.1/msg/wdimex.sh	2000-04-17 15:02:52.000000000 -0400
+++ annie4.1.new/msg/wdimex.sh	2006-03-24 21:19:54.000000000 -0500
@@ -18,7 +18,9 @@
 
 # pathnames and directories
   WrdA=/usr/opt/wrdapp
+  WrdA=/usr
   Libr=$WrdA/libanne4.0
+  Libr=$WrdA
 
 #*******************************************************************
 #***** You should not need to modify anything below this line. *****
@@ -67,12 +69,13 @@
      done
      for Seq in $SeqLib ; do
         echo I >> $Name.in
-        echo $Libr/msg/$Seq.seq >> $Name.in
+        echo $Seq.seq >> $Name.in
      done
      echo R >> $Name.in
 
 #    get message file shell
-     cp $Libr/lib_data/message.wdm $Name.wdm
+     cp $Libr/share/libanne/message.wdm $Name.wdm
+     cp $Libr/share/libanne/message.wdm message.wdm
 
 #    build message file
      $Libr/bin/wdimex < $Name.in
@@ -102,7 +105,7 @@
      echo $Name.wdm > $Name.in
      echo C >> $Name.in
      echo N >> $Name.in
-     echo $Libr/lib_data/message.wdm >> $Name.in
+     echo message.wdm >> $Name.in
      for Seq in $SeqDat ; do
         echo I >> $Name.in
         echo $Seq >> $Name.in
diff -ur annie4.1/src/Makefile annie4.1.new/src/Makefile
--- annie4.1/src/Makefile	2001-10-12 15:41:02.000000000 -0400
+++ annie4.1.new/src/Makefile	2006-03-24 19:57:12.000000000 -0500
@@ -11,16 +11,16 @@
 #           99/07/30 kmflynn
 
 # pathnames
-WrdA = /usr/opt/wrdapp
-Libr = $(WrdA)/libanne4.0
+WrdA = /usr
+Libr = $(WrdA)
 
 FFVrsn = $(FFUnix)          # Version FF[Unix, AIX]
 FFLAGS = $(OptM) $(FFVrsn)  # compile options [OptM or DbgF] + FFVrsn
-FC     = f77                # Compiler name
-LGks   = $(GliGks_S)        # Graph lib [Gli, X, Prior]Gks_[S, D]
-LdA    = $(LdSunA)          # Ld[Unix, Sun]A
-LdB    = $(LdSunB)          # Ld[Unix, Sun]B
-LdC    = $(LdSunC)          # Ld[Unix, Sun]C
+FC     = g77                # Compiler name
+LGks   = $(GliGks_D)        # Graph lib [Gli, X, Prior]Gks_[S, D]
+LdA    = $(LdUnixA)          # Ld[Unix, Sun]A
+LdB    = $(LdUnixB)          # Ld[Unix, Sun]B
+LdC    = $(LdUnixC)          # Ld[Unix, Sun]C
 Strip  = $(Strip_Y)         # strip [Strip_Y or Strip_N]
 
 #*******************************************************************
@@ -85,8 +85,8 @@
 #*******************************************************************
 
 # library directories
-libwdm  = $(Libr)/lib_data
-libmsg  = $(Libr)/msg
+libwdm  = $(Libr)/share/libanne
+libmsg  = $(Libr)/share/libanne/msg
 LibBin  = $(Libr)/bin
 LibDir  = $(Libr)/lib
 
@@ -118,7 +118,7 @@
 msgMake = $(binData)/$(msgFile)
 
 # Rules
-all:  first $(binMake) $(binRX) $(msgMake) $(wdmTest) install
+all:  first $(binMake) $(binRX) $(msgMake) $(wdmTest) 
 	@echo "***"
 	@echo "*** Done making all for $(program), files are now up-to-date."
 	@echo "***"
diff -ur annie4.1/src/fanmes.inc annie4.1.new/src/fanmes.inc
--- annie4.1/src/fanmes.inc	2002-02-25 14:52:20.000000000 -0500
+++ annie4.1.new/src/fanmes.inc	2006-03-24 06:35:01.000000000 -0500
@@ -16,3 +16,4 @@
       WNDNAM= 'ANNIE 4.1'
       APPNAM= 'ANNIE   '
       FNAME = '/usr/opt/wrdapp/annie4.1/bin_data/anmess.wdm'
+      FNAME = '/usr/share/libanne/anmess.wdm'