X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FMakefile.cfg;h=6b946969d53d7dbe3bc13024e3aa3871a1def39a;hb=92517b68b7582251f69db7e062d5e5a4c773791f;hp=fd8bc45121d0961d89ed9bd1fac075d0d770341b;hpb=4f6ab5fa31fb60ddd8085783c8d21a48cab4c674;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/Makefile.cfg b/Usermode/Applications/Makefile.cfg
index fd8bc451..6b946969 100644
--- a/Usermode/Applications/Makefile.cfg
+++ b/Usermode/Applications/Makefile.cfg
@@ -1,14 +1,18 @@
 # Acess 2 Applications
 # General Makefile
 
--include ../../../Makefile.cfg
+#-include ../../../Makefile.cfg
 # satisfying 2 deep applications
-if $(ACESSDIR) == "" then
-	-include ../../../../Makefile.cfg
+#ifeq ($(ACESSDIR),)
+#	-include ../../../../Makefile.cfg
 #endif
-ACESSUSERDIR := $(ACESSDIR)/Usermode
+
+# Include Usermode Makefile.cfg
+include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg
+
 
 ASFLAGS = -felf
 CPPFLAGS = -I$(ACESSUSERDIR)/include/
 CFLAGS   = -fno-stack-protector $(CPPFLAGS)
-LDFLAGS  = -T $(ACESSUSERDIR)/Libraries/acess.ld -L $(ACESSUSERDIR)/Libraries -I /Acess/Libs/ld-acess.so -lc
+LDFLAGS  = -T $(OUTPUTDIR)Libs/acess.ld -rpath-link $(OUTPUTDIR)Libs -L $(OUTPUTDIR)Libs -I /Acess/Libs/ld-acess.so -lc
+DIR = Bin