--- core/scripts/CMakeLists.txt	2019-12-12 12:04:14.000000000 -0500
+++ core/scripts/CMakeLists.txt	2019-12-28 16:23:36.207715000 -0500
@@ -17,36 +17,37 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
+IF(client-only)
+   INSTALL(FILES
+            bareos btraceback
+            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                                    GROUP_READ GROUP_EXECUTE
+                                    WORLD_READ WORLD_EXECUTE
+            DESTINATION "${sbindir}")
 
-INSTALL(FILES
-         bareos btraceback
-         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-                                 GROUP_READ GROUP_EXECUTE
-                                 WORLD_READ WORLD_EXECUTE
-         DESTINATION "${sbindir}")
+   INSTALL(FILES
+	    bareos-ctl-fd
+            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                        GROUP_READ GROUP_EXECUTE
+                        WORLD_READ WORLD_EXECUTE
+            DESTINATION "${scriptdir}"
+	    COMPONENT filedaemon)
 
-INSTALL(FILES
-	 bareos-ctl-fd
-         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-                     GROUP_READ GROUP_EXECUTE
-                     WORLD_READ WORLD_EXECUTE
-         DESTINATION "${scriptdir}"
-	 COMPONENT filedaemon)
+   INSTALL(FILES
+            bareos
+            btraceback.gdb
+            btraceback.dbx
+            btraceback.mdb
+            bareos-config
+            bareos-config-lib.sh
+            bareos-ctl-funcs
+            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                        GROUP_READ GROUP_EXECUTE
+                        WORLD_READ WORLD_EXECUTE
+            DESTINATION "${scriptdir}"
+   	   )
+ENDIF()
 
-INSTALL(FILES
-         bareos
-         btraceback.gdb
-         btraceback.dbx
-         btraceback.mdb
-         bareos-config
-         bareos-config-lib.sh
-         bareos-ctl-funcs
-         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-                     GROUP_READ GROUP_EXECUTE
-                     WORLD_READ WORLD_EXECUTE
-         DESTINATION "${scriptdir}"
-	)
-
 IF(NOT client-only)
    INSTALL(FILES
          mtx-changer
@@ -55,7 +56,6 @@
          bareos-glusterfind-wrapper
          bareos-ctl-dir
          bareos-ctl-sd
-         bareos-ctl-funcs
          PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
                      GROUP_READ GROUP_EXECUTE
                      WORLD_READ WORLD_EXECUTE