updated Makefiles to work better when ETRAX=1 is set

diff --git a/Makefile b/Makefile
index 4b75140205da65f12c7fa5d5cb5c5d000f059387..da7b70271eee2052ca199b42cb7562330bac694f 100644 (file)
--- 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 e2430ceaf2767f242a3c11e2eeb08c5de16c2aa3..a058457af20f930f4d2fb9042bf8669f03a748d5 100644 (file)
--- 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 (file)
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 60237836d2a6e982c9e4f241b91b7d3f84a28d3f..fdee5ead1d4052a85aba5c1f50d21ca36a25dc7f 100644 (file)
--- 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 --------------------------------------------