--- Makefile.orig
+++ Makefile
@@ -89,6 +89,7 @@
 SDL2_LIBS ?= $(shell sdl2-config --libs)
 
 CFLAGS_c += $(BUILD_DEFS) $(VER_DEFS) $(PATH_DEFS) $(SDL2_CFLAGS) -DNDEBUG -DJSS_CAM -DUSE_PR2 -DWITH_NQPROGS -DUSE_SDL2 -DWITH_ZIP
+CFLAGS_c += -DQ1DIR='"$(Q1DIR)"' -DDATADIR='"$(DATADIR)"'
 LIBS_c += $(SDL2_LIBS)
 
 # built-in requirements
@@ -379,7 +380,7 @@
 ifdef CONFIG_WINDOWS
     TARG_c := ezquake.exe
 else
-    TARG_c := ezquake-$(LSYS)-$(CPU)
+    TARG_c := ezquake-$(LSYS)
 endif
 
 all: $(TARG_c)
