diff --git a/conf/bash-completion.d/Makefile b/conf/bash-completion.d/Makefile
index a4772e58..8b18976d 100644
--- a/conf/bash-completion.d/Makefile
+++ b/conf/bash-completion.d/Makefile
@@ -1,8 +1,8 @@
-TOPDIR = ../..
+TOPDIR                       = ../..
 
-INSTALL_CFGDIR = $(ENV_PREFIX)/usr/share/bash-completion/completions
-LOCAL_CFG = $(filter-out Makefile,$(wildcard *))
-PACKAGE_INSTALL_DIR = false
+INSTALL_CFGDIR               = $(ROOT_PREFIX)/usr/share/bash-completion/completions
+LOCAL_CFG                    = $(filter-out Makefile,$(wildcard *))
+PACKAGE_INSTALL_DIR          = false
 
 include $(TOPDIR)/make/proj.mk
 include $(JWBDIR)/make/conf.mk
diff --git a/scripts/usr-bin/Makefile b/scripts/usr-bin/Makefile
index 69c37ad1..8c937984 100644
--- a/scripts/usr-bin/Makefile
+++ b/scripts/usr-bin/Makefile
@@ -1,6 +1,6 @@
 TOPDIR = ../..
 
-TARGET_DIR = $(ENV_PREFIX)/usr/bin
+TARGET_DIR = $(ROOT_PREFIX)/usr/bin
 
 include $(TOPDIR)/make/proj.mk
 include $(JWBDIR)/make/defs.mk