From c29175d8064b3428685da1155704b6c54c116b94 Mon Sep 17 00:00:00 2001
From: danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Thu, 3 Sep 2009 02:30:03 +0000
Subject: Remove COMPILE_ROOT and MAKESTYLE variables

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11667 e03df62e-2008-0410-955e-edbf42e46eb7
---
 .Makefile.inc | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to '.Makefile.inc')

diff --git a/.Makefile.inc b/.Makefile.inc
index b2eaa4abe..3cc18b60d 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -6,11 +6,6 @@
 #   Please do not edit unless you know what you're doing.
 #
 
-@GNU_ONLY MAKESTYLE = gnu
-@GNU_ONLY COMPILE_ROOT ?= $(shell pwd)
-@BSD_ONLY MAKESTYLE = bsd
-@BSD_ONLY COMPILE_ROOT != pwd
-
 CC = @CC@
 SYSTEM = @SYSTEM@
 SOCKETENGINE = @SOCKETENGINE@
@@ -57,7 +52,7 @@ INSTMODE = 0755
 @ENDIF
 FOOTER = finishmessage
 
-CXXFLAGS += -I$(COMPILE_ROOT)/include
+CXXFLAGS += -I../include
 
 @GNU_ONLY MAKEFLAGS += --no-print-directory
 
@@ -67,7 +62,7 @@ CXXFLAGS += -I$(COMPILE_ROOT)/include
 @ELSE
     @GNU_ONLY MAKEFLAGS += --silent
     @BSD_ONLY MAKE += -s
-    RUNCC = $(COMPILE_ROOT)/make/run-cc.pl $(CC)
+    RUNCC = ../make/run-cc.pl $(CC)
 @ENDIF
 
 @DO_EXPORT RUNCC CXXFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
@@ -92,7 +87,8 @@ TARGET = all
 all: $(FOOTER)
 
 target: $(HEADER)
-	$(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-real.mk $(TARGET)
+@GNU_ONLY 	$(MAKEENV) $(MAKE) -C src -f ../make/gnu-real.mk $(TARGET)
+@BSD_ONLY 	$(MAKEENV) $(MAKE) -C src -f ../make/bsd-real.mk $(TARGET)
 
 debug:
 	@${MAKE} D=1 all
-- 
cgit v1.2.3