From: Ludwig Maier <lmaier@bia.e12.ph.tum.de>
Date: Fri, 28 Jun 2013 16:24:36 +0000 (+0200)
Subject: updated Makefiles to work better when ETRAX=1 is set
X-Git-Tag: v6.0~7
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=2197fb809044b76d1ea42976dc4f3de72815cb50;p=trbnettools.git

updated Makefiles to work better when ETRAX=1 is set
---

diff --git a/Makefile b/Makefile
index 4b75140..da7b702 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # ------------ TARGETS -------------------------------------------------
 
 ifdef ETRAX
-TARGETS = libtrbnet trbrich
+TARGETS = libtrbnet trbrich trbnetd perllib
 else ifdef PEXOR
 TARGETS = libtrbnet trbrich trbnetd pexor perllib
 else ifdef TRB3
@@ -49,9 +49,11 @@ depend:
 
 .PHONY: install
 ifdef ETRAX
-install: libtrbnet trbrich
-	make -C libtrbnet install
+install: libtrbnet trbrich trbnetd
+	make -C libtrbnet install 
 	make -C trbrich install
+	make -C trbnetd install
+	make -C libtrbnet_perl install
 else ifdef PEXOR
 install: libtrbnet trbrich trbnetd pexor
 	make -C libtrbnet install
diff --git a/libtrbnet/Makefile b/libtrbnet/Makefile
index e2430ce..a058457 100644
--- a/libtrbnet/Makefile
+++ b/libtrbnet/Makefile
@@ -98,7 +98,11 @@ 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
 	install  -m 664 trbnet.h trberror.h pexor_user.h ../include/
+else
+	install  -m 664 trbnet.h trberror.h ../include/
+endif
 
 # ------------ Dependencies --------------------------------------------
 
diff --git a/libtrbnet_perl/.gitignore b/libtrbnet_perl/.gitignore
new file mode 100644
index 0000000..6dc3062
--- /dev/null
+++ b/libtrbnet_perl/.gitignore
@@ -0,0 +1 @@
+Makefile.old
diff --git a/libtrbnet_perl/makefile b/libtrbnet_perl/makefile
index 6023783..fdee5ea 100644
--- a/libtrbnet_perl/makefile
+++ b/libtrbnet_perl/makefile
@@ -15,7 +15,12 @@ distclean: clean
 
 .PHONY: install
 install: Makefile
+ifndef DESTDIR
+	make -f Makefile DESTDIR=../lib install
+else
 	make -f Makefile install
+endif
+	
 
 # ------------ Dependencies --------------------------------------------