Fix and revamp OpenLMI build code

bin/eemk.in

@@ -12,6 +12,7 @@ ffoo import yummy
 
 ENVIRON_SCRIPT="$HOME/.eemk-env"
 FFOO_VERBOSE=true
+OL_TRY_JM=${OL_TRY_JM:-false}
 TEST_STATUS=0
 
 # tmp needs to be shared to children
@@ -27,6 +28,21 @@ fi
 
 yum_install_if_needed wget
 
+fc22plus() {
+    test "$(guess_rtag_word)" == "fc" -a 0$(guess_rtag_num) -ge 22
+}
+
+maybe_with_jobmanager() {
+    debug -v OL_TRY_JM
+    debug -c fc22plus
+    if $OL_TRY_JM || fc22plus;
+    then
+        echo -DWITH-JOBMANAGER=1
+    else
+        echo -DWITH-JOBMANAGER=0
+    fi
+}
+
 case "$1" in
 
 
@@ -119,12 +135,6 @@ case "$1" in
         # let's build *anything*
         case $2 in
             p|openlmi-providers)
-                withjm=0
-                rtag_word=$(guess_rtag_word)
-                rtag_num=$(guess_rtag_num)
-                test "$rtag_word" == "fc" \
-                    -a 0$rtag_num -ge 22 \
-                    && withjm=1
                 (
                     mkdir -p openlmi-providers/build
                     cd openlmi-providers/build
@@ -132,7 +142,7 @@ case "$1" in
                              -DWITH-FAN=0 \
                              -DWITH-POWER=0 \
                              -DWITH-SSSD=0 \
-                             -DWITH-JOBMANAGER=$withjm
+                             $(maybe_with_jobmanager)
                     make
                     make doc
                     make install
@@ -141,10 +151,11 @@ case "$1" in
                 ;;
             t|openlmi-tools)
                 (
-                    cd openlmi-tools
+                    cd openlmi-tools/cli
+                    make clean
+                    make
+                    python setup.py install || die "could not install openlmi-tools"
                     make clean
-                    make setup
-                    python setup.py install
                 )
                 ;;
             *)