diff --git a/make/defs.mk b/make/defs.mk
index 86b44d43..64abc403 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -96,34 +96,6 @@ ifndef PRISTINE_MAKE
   PRISTINE_MAKE             := umask $(MINIMAL_UMASK) && MAKEFLAGS=$(MINIMAL_MAKEFLAGS) LD_LIBRARY_PATH=$(MINIMAL_LD_LIBRARY_PATH) PATH=$(MINIMAL_PATH) $(MAKE)
 endif
 
-PKG_SH_EXE                  := /bin/bash $(JWB_SCRIPT_DIR)/pkg.sh
-LOG_INSTALL_SH              := $(PKG_SH_EXE) log-install
-UPDATE_REPO_SH              := /opt/packager-server/bin/packager-server schedule-rebuild
-
-ifdef INSTALL_LINK
-  INSTALL                    = $(SUDO) $(LOG_INSTALL_SH) -WA $(LOG_INSTALL_EXTRA_OPTS)
-  LINK_LIB                   = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
-else ifdef INSTALL_SYMLINK
-  INSTALL                    = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
-  LINK_LIB                   = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
-else
-  ifdef INSTALL_LOG
-    INSTALL                  = $(LOG_INSTALL_SH) -p -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS)
-    LINK_LIB                 = $(LOG_INSTALL_SH) -L -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS)
-  else
-    ifndef INSTALL
-      ifeq ($(DEVELOPMENT),false)
-        INSTALL              = $(SUDO) install
-      else
-        INSTALL              = install
-      endif
-    endif
-    ifndef LINK_LIB
-      LINK_LIB               = $(LOG_INSTALL_SH) -L
-    endif
-  endif
-endif
-
 # ----- function definitions
 
 reverse                      = $(if $(wordlist 2,2,$(1)),$(call reverse,$(wordlist 2,$(words $(1)),$(1))) $(firstword $(1)),$(1))
@@ -206,6 +178,34 @@ else
   PKG_FORMAT                ?= rpm
 endif
 
+PKG_SH_EXE                  := /bin/bash $(JWB_SCRIPT_DIR)/pkg.sh
+LOG_INSTALL_SH              := $(PKG_SH_EXE) log-install -f $(PKG_FORMAT)
+UPDATE_REPO_SH              := /opt/packager-server/bin/packager-server schedule-rebuild
+
+ifdef INSTALL_LINK
+  INSTALL                    = $(SUDO) $(LOG_INSTALL_SH) -WA $(LOG_INSTALL_EXTRA_OPTS)
+  LINK_LIB                   = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
+else ifdef INSTALL_SYMLINK
+  INSTALL                    = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
+  LINK_LIB                   = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
+else
+  ifdef INSTALL_LOG
+    INSTALL                  = $(LOG_INSTALL_SH) -p -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS)
+    LINK_LIB                 = $(LOG_INSTALL_SH) -L -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS)
+  else
+    ifndef INSTALL
+      ifeq ($(DEVELOPMENT),false)
+        INSTALL              = $(SUDO) install
+      else
+        INSTALL              = install
+      endif
+    endif
+    ifndef LINK_LIB
+      LINK_LIB               = $(LOG_INSTALL_SH) -L
+    endif
+  endif
+endif
+
 ifeq ($(PKG_FORMAT),debian)
   RPM                       ?= /bin/bash $(JWB_SCRIPT_DIR)/dpm.sh
   RPM_ARCH                  := $(shell dpkg --print-architecture)