From: Ludwig Maier <lmaier@bia.e12.ph.tum.de>
Date: Fri, 28 Jun 2013 16:41:03 +0000 (+0200)
Subject: perllib will be install to ./lib/usr/... by default
X-Git-Tag: v6.0~6
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=7447e361a126c4f0018ebb23268e91f2791d1e20;p=trbnettools.git

perllib will be install to ./lib/usr/... by default
---

diff --git a/libtrbnet/Makefile b/libtrbnet/Makefile
index a058457..ae4ab82 100644
--- a/libtrbnet/Makefile
+++ b/libtrbnet/Makefile
@@ -98,7 +98,8 @@ install: $(TARGETS) $(LIB_TARGETS)
 	mkdir -m 2775 -p ../binlocal ../liblocal ../include
 	install  -m 775 $(TARGETS) ../binlocal/
 	install  -m 775 $(LIB_TARGETS) ../liblocal/
-ifndef AXIS_TOP_DIR
+
+ifdef PEXOR
 	install  -m 664 trbnet.h trberror.h pexor_user.h ../include/
 else
 	install  -m 664 trbnet.h trberror.h ../include/
@@ -106,7 +107,7 @@ endif
 
 # ------------ Dependencies --------------------------------------------
 
-ifndef AXIS_TOP_DIR
+ifdef PEXOR
 pexor_user.h:
 	ln -s ../pexor/kernel-module/pexor_user.h
 
diff --git a/trbnetd/server/Makefile b/trbnetd/server/Makefile
index d346b20..b1b5295 100644
--- a/trbnetd/server/Makefile
+++ b/trbnetd/server/Makefile
@@ -1,14 +1,19 @@
 # ------------ Compiler / Linker Options -------------------------------
 
-ifdef AXIS_TOP_DIR
+ifdef ETRAX
 	AXIS_USABLE_LIBS = UCLIBC GLIBC
 	include $(AXIS_TOP_DIR)/tools/build/Rules.axis
-else	
+	CPPFLAGS = -DETRAX
+else
 	CC = gcc
 	ifeq ($(shell uname -m), x86_64)
-		CPPFLAGS = -DPEXOR -DX86_64
-	else	
-		CPPFLAGS = -DPEXOR
+		ARCH = -DX86_64
+	endif
+
+	ifdef TRB3
+		CPPFLAGS = $(ARCH) -DTRB3
+	else
+		CPPFLAGS = $(ARCH) -DPEXOR
 	endif
 endif