diff --git a/make/exe.mk b/make/exe.mk
index 89ce0b9d..8cb2ed4f 100644
--- a/make/exe.mk
+++ b/make/exe.mk
@@ -6,7 +6,6 @@
 include $(MODDIR)/make/run.mk
 include $(MODDIR)/make/depend.mk
 
-EXE ?= $(EXE_BASENAME)
 all: $(EXE) $(BUILD_EXE_BIN) $(STRIP_DONE)
 install: $(INSTALLED_EXE) $(INSTALLED_EXE_BIN)
 run test: all.dirs $(EXE) $(EXE_BIN)
diff --git a/make/run.mk b/make/run.mk
index eda12a65..50b0559b 100644
--- a/make/run.mk
+++ b/make/run.mk
@@ -13,14 +13,15 @@ ifeq ($(EXE_BASENAME),)
   endif
 endif
 
+EXE ?= $(EXE_BASENAME)
+EXE_PATH ?= ./$(EXE)
+
 include $(MODDIR)/make/defs.mk
 BUILD_HDR =
 include $(MODDIR)/make/rules.mk
 include $(MODDIR)/make/ldlibpath.mk
 include $(MODDIR)/make/debugger.mk
 
-EXE_PATH ?= ./$(EXE)
-
 ifneq ($(wildcard local.supp),)
 VALGRIND_OPTS      += --suppressions=local.supp
 endif