diff --git a/Makefile b/Makefile
index efab43989f2016c6efb1140220df5dccc020a164..e6a9f44e39c69fe0e3aed837fcc62c846cacabea 100644
--- a/Makefile
+++ b/Makefile
@@ -129,13 +129,11 @@ ifeq ("$(SYSTEM)", "Darwin")
 endif
 
 BZ2=""
-INTERFACE_SOURCE := $(CORSIKA_DATA)/readLib/source/Interface.dummy.cc
+INTERFACE_SOURCE := $(TABDIR)/readLib/source/Interface.dummy.cc
 OBJS += $(OBJDIR)/Interface.o
-ifdef CORSIKA_DATA
-  ifndef NO_BOOST
-    BZ2=".bz2"
-    INTERFACE_SOURCE := $(CORSIKA_DATA)/readLib/source/Interface.boost.cc
-  endif
+ifndef NO_BOOST
+  BZ2=".bz2"
+  INTERFACE_SOURCE := $(TABDIR)/readLib/source/Interface.boost.cc
 endif
 
 
@@ -207,7 +205,7 @@ $(OBJDIR)/ConexDynamicInterface.o: dirs src/ConexDynamicInterface.cc src/ConexDy
 
 # the optional compressed data reading 
 $(OBJDIR)/Interface.o: $(INTERFACE_SOURCE) 
-	$(CXX) -I$(CORSIKA_DATA)/readLib $(CXXFLAGS) $^ -c -o $@
+	$(CXX) -I$(TABDIR)/readLib $(CXXFLAGS) $^ -c -o $@
 
 $(OBJDIR)/CxRoot.o: dirs src/CxRoot.cc src/CxRoot.h src/conexConfig.h src/leadingInteractionsData.cc src/leadingInteractionsData.h
 	$(CXX) $(CXXFLAGS) $(ROOTCXXFLAGS)  -D_CONEX_PREFIX=\"$(CONEX_PREFIX)\" -D_CONEX_SYSTEM=\"$(SYSTEM)\" src/CxRoot.cc -c -o $@