From 78ebc6fda3c52872da1604e501251355316dbf01 Mon Sep 17 00:00:00 2001
From: Scott Fennell <spfennell@gmail.com>
Date: Thu, 30 Jan 2020 09:40:17 -0600
Subject: [PATCH] apps can find trick_icon, minor change to configure #938

---
 autoconf/configure.ac           | 4 ++--
 configure                       | 4 ++--
 libexec/trick/pm/launch_java.pm | 2 +-
 libexec/trick/vc                | 2 +-
 trick_source/java/Makefile      | 7 +++++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 7285ab7a..7e23af95 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -167,8 +167,8 @@ AC_DEFUN([AX_JAVA],[
          [AC_MSG_RESULT([no])
           AC_MSG_ERROR([Trick requires javac version >= 1.8])
          ])
-        AC_PATH_PROG(MVN, mvn, mvn)
-        AS_IF([test "$ac_cv_path_MVN" = "nomvn"],AC_MSG_ERROR([could not find mvn]),[])
+        AC_PATH_PROG(MVN, mvn, nomvn)
+        AS_IF([test "$ac_cv_path_MVN" = "nomvn"],AC_MSG_ERROR([could not find maven]),[])
      ],[])
 ])
 
diff --git a/configure b/configure
index 185c1a5b..bd294854 100755
--- a/configure
+++ b/configure
@@ -6137,7 +6137,7 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_MVN" && ac_cv_path_MVN="mvn"
+  test -z "$ac_cv_path_MVN" && ac_cv_path_MVN="nomvn"
   ;;
 esac
 fi
@@ -6152,7 +6152,7 @@ fi
 
 
         if test "$ac_cv_path_MVN" = "nomvn"; then :
-  as_fn_error $? "could not find mvn" "$LINENO" 5
+  as_fn_error $? "could not find maven" "$LINENO" 5
 fi
 
 fi
diff --git a/libexec/trick/pm/launch_java.pm b/libexec/trick/pm/launch_java.pm
index 2812637b..76aa8f44 100644
--- a/libexec/trick/pm/launch_java.pm
+++ b/libexec/trick/pm/launch_java.pm
@@ -36,7 +36,7 @@ sub launch_java($$) {
     if ( $^O eq "darwin" ) {
         $command .= "\\
              -Xdock:name=\"$name\" \\
-             -Xdock:icon=$java_dir/resources/trick_icon.png \\
+             -Xdock:icon=$java_dir/build/classes/common/resources/trick_icon.png \\
              -Djava.net.preferIPv4Stack=true \\" ;        
     }
 
diff --git a/libexec/trick/vc b/libexec/trick/vc
index 73d323ba..c0f157fa 100755
--- a/libexec/trick/vc
+++ b/libexec/trick/vc
@@ -16,7 +16,7 @@ if ( ! exists $ENV{TRICK_HOME} ) {
 if ( $^O eq "darwin" ) {
     $command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* \\
          -Xdock:name=\"Variable Counter\" \\
-         -Xdock:icon=$ENV{TRICK_HOME}/bin/java/resources/trick_icon.png \\
+         -Xdock:icon=$ENV{TRICK_HOME}/libexec/trick/java/build/classes/common/resources/trick_icon.png \\
          trick.vc.VariableCounter " . join (" " , @ARGV) ;
 } else {
     $command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* trick.vc.VariableCounter " . join (" " , @ARGV) ;
diff --git a/trick_source/java/Makefile b/trick_source/java/Makefile
index 2b13ea9b..84d68beb 100644
--- a/trick_source/java/Makefile
+++ b/trick_source/java/Makefile
@@ -1,6 +1,6 @@
 TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../..)
 
-all: ${TRICK_HOME}/libexec/trick/java/build
+all: ${TRICK_HOME}/libexec/trick/java/build resources
 	@echo "Java build successful"
 
 ${TRICK_HOME}/libexec/trick/java/build:
@@ -10,4 +10,7 @@ javadoc:
 	mvn javadoc:javadoc
 
 clean:
-	mvn clean
\ No newline at end of file
+	mvn clean
+
+resources: ${RESOURCES_DIR}/trick_icon.png: ${SRC_DIR}/trick/common/resources/trick_icon.png ${RESOURCES_DIR}
+	@cp $< $@
\ No newline at end of file