From ed91a35847aca333b77c6b27ea196b5949e1f5d4 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Sat, 18 Jan 2014 13:59:19 +0000
Subject: [PATCH] 1. Corrected handling of compound callsigns: use JT65v1
 encoding if    applicable, JT65v2 otherwise.  Thanks to DL9RDZ!

2. Fix a bug in flat3.f90, evident on OSX systems.  Thanks to G4KLA!

3. The Makefile now copy the jt9code executable into the destination
   directory for to-be-packaged executables.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3648 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/Makefile.MinGW | 1 +
 lib/Makefile.linux | 1 +
 lib/flat3.f90      | 2 +-
 lib/getpfx1.f90    | 2 +-
 lib/packmsg.f90    | 3 ++-
 mainwindow.cpp     | 2 +-
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/Makefile.MinGW b/lib/Makefile.MinGW
index a8d028daa..cb933aaad 100644
--- a/lib/Makefile.MinGW
+++ b/lib/Makefile.MinGW
@@ -72,6 +72,7 @@ jt9sim.exe: $(OBJS3) libjt9.a
 OBJS4 = jt9code.o 
 jt9code.exe: $(OBJS4) libjt9.a
 	$(FC) -o jt9code.exe $(OBJS4) libjt9.a
+	cp jt9code.exe $(EXE_DIR)
 
 OBJS5 = jt65.o 
 jt65.exe: $(OBJS5) libjt9.a 
diff --git a/lib/Makefile.linux b/lib/Makefile.linux
index 0af66dd75..1764b6109 100644
--- a/lib/Makefile.linux
+++ b/lib/Makefile.linux
@@ -62,6 +62,7 @@ jt9sim: $(OBJS3) libjt9.a
 OBJS4 = jt9code.o 
 jt9code: $(OBJS4) libjt9.a
 	$(FC) -o jt9code $(OBJS4) -L. -ljt9
+	cp jt9code $(EXE_DIR)
 
 sync9.o: sync9.f90 jt9sync.f90
 	$(FC) $(FFLAGS) -c sync9.f90
diff --git a/lib/flat3.f90 b/lib/flat3.f90
index 5ca2ae9ee..7c97c2ec0 100644
--- a/lib/flat3.f90
+++ b/lib/flat3.f90
@@ -4,7 +4,7 @@ subroutine flat3(s0,iz,nfa,nfb,nterms,ynoise,s)
   parameter (NSMAX=6827)
   real*4 s0(iz)
   real*4 s(iz)
-  real*4 ynoise,y4
+  real*4 ynoise,y4,db
 
   real*8 x(NSMAX)
   real*8 y(NSMAX)
diff --git a/lib/getpfx1.f90 b/lib/getpfx1.f90
index 4d4e7aa06..2d4603bd9 100644
--- a/lib/getpfx1.f90
+++ b/lib/getpfx1.f90
@@ -13,7 +13,7 @@ subroutine getpfx1(callsign,k,nv2)
   if(iz.lt.0) iz=12
   islash=index(callsign(1:iz),'/')
   k=0
-  if(k.eq.0) go to 10                             !### Always use JT65v2 ###
+!  if(k.eq.0) go to 10     !Tnx to DL9RDZ for reminder:this was for tests only!
   c='   '
   if(islash.gt.0 .and. islash.le.(iz-4)) then
 ! Add-on prefix
diff --git a/lib/packmsg.f90 b/lib/packmsg.f90
index 6c7619bd0..74c357b0f 100644
--- a/lib/packmsg.f90
+++ b/lib/packmsg.f90
@@ -60,7 +60,8 @@ subroutine packmsg(msg,dat,text)
   c3='    '
   if(ic.ge.ib+1) c3=msg(ib+1:ic)
   if(c3.eq.'OOO ') c3='    '           !Strip out the OOO flag
-  call getpfx1(c1,k1,junk)
+  call getpfx1(c1,k1,kk)
+  if(kk.ne.0) go to 10                 !Tnx to DL9RDZ for reminding me!
   call packcall(c1,nc1,text1)
   call getpfx1(c2,k2,nv2)
   call packcall(c2,nc2,text2)
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 8b1d6ae43..74d5490cb 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//-------------------------------------------------------------- MainWindow
+//------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"