Normalize MAKEDIR, ONF_MAKEDIR and ONF_MAKE

Change-Id: I3908c0738dbbed180d62dc0f4ba656226035ba5a
diff --git a/Makefile b/Makefile
index d397fb9..5ccb977 100644
--- a/Makefile
+++ b/Makefile
@@ -21,17 +21,12 @@
 ##-------------------##
 ##---]  GLOBALS  [---##
 ##-------------------##
-TOP          ?= .
-MAKEDIR      ?= $(TOP)/makefiles
-
-# ONF_MAKEDIR   ?= $(HOME)/repo/onf-make/makefiles
-# include $(ONF_MAKEDIR)/include.mk
 
 ##--------------------##
 ##---]  INCLUDES  [---##
 ##--------------------##
 include config.mk#                # configure
-include $(MAKEDIR)/include.mk     # top level include
+include makefiles/include.mk      # top level include
 
 ## Display make help text late
 include $(ONF_MAKEDIR)/help/trailer.mk