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

diff --git a/libtrbnet/Makefile b/libtrbnet/Makefile
index a058457af20f930f4d2fb9042bf8669f03a748d5..ae4ab82b2774d55f77802664cd06816c7394ef94 100644 (file)
--- 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 d346b20dadbdb4a7f2656773abe0f4907b966c80..b1b52956144bc5e78c17d7351279e8a9c5b0778d 100644 (file)
--- 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