temp patch DESTDIR

diff --git a/libtrbnet/Makefile b/libtrbnet/Makefile
index ae4ab82b2774d55f77802664cd06816c7394ef94..01ce38c30321b272565b6c56ef734960fd3590f8 100644 (file)
--- a/libtrbnet/Makefile
+++ b/libtrbnet/Makefile
@@ -1,4 +1,9 @@
 # ------------ Compiler / Linker Options -------------------------------
+
+ifndef DESTDIR
+       DESTDIR=..
+endif
+
 ifdef ETRAX
        AXIS_USABLE_LIBS = UCLIBC GLIBC
        include $(AXIS_TOP_DIR)/tools/build/Rules.axis
@@ -95,14 +100,13 @@ depend:
        $(CC) -MM $(CFLAGS) $(CPPFLAGS) $(INCDIR) *.c
 
 install: $(TARGETS) $(LIB_TARGETS)
-       mkdir -m 2775 -p ../binlocal ../liblocal ../include
-       install  -m 775 $(TARGETS) ../binlocal/
-       install  -m 775 $(LIB_TARGETS) ../liblocal/
-
+       mkdir -p $(DESTDIR)/binlocal $(DESTDIR)/liblocal $(DESTDIR)/include
+       install  -m 775 $(TARGETS) $(DESTDIR)/binlocal/
+       install  -m 664 $(LIB_TARGETS) $(DESTDIR)/liblocal/
 ifdef PEXOR
-       install  -m 664 trbnet.h trberror.h pexor_user.h ../include/
+       install  -m 664 trbnet.h trberror.h pexor_user.h $(DESTDIR)/include/
 else
-       install  -m 664 trbnet.h trberror.h ../include/
+       install  -m 664 trbnet.h trberror.h $(DESTDIR)/include/
 endif
 
 # ------------ Dependencies --------------------------------------------

diff --git a/libtrbnet_perl/makefile b/libtrbnet_perl/makefile
index fdee5ead1d4052a85aba5c1f50d21ca36a25dc7f..875b3c92b46e278a4274b89c8bdfd5cffb6a5601 100644 (file)
--- a/libtrbnet_perl/makefile
+++ b/libtrbnet_perl/makefile
@@ -16,7 +16,7 @@ distclean: clean
 .PHONY: install
 install: Makefile
 ifndef DESTDIR
-       make -f Makefile DESTDIR=../lib install
+       make -f Makefile install
 else
        make -f Makefile install
 endif

diff --git a/pexor/Makefile b/pexor/Makefile
index 9139458379e8a08fc3766a36f38cdbf33fa27eff..128365c0fe0c3e80cc181f4ab20e6d50ddfb24ab 100644 (file)
--- a/pexor/Makefile
+++ b/pexor/Makefile
@@ -1,5 +1,9 @@
 # ------------ Compiler / Linker Options -------------------------------
 
+ifndef DESTDIR
+       DESTDIR=..
+endif
+
 ARCH=$(shell uname -m)
 ifeq ($(shell uname -m), x86_64)
        CPPFLAGS = -DPEXOR -DX86_64
@@ -87,8 +91,8 @@ depend:
        $(CC) -MM $(CFLAGS) $(CPPFLAGS) $(INCDIR) *.c
 
 install: pexorflash kernel-driver
-       mkdir -m 2775 -p ../binlocal/
-       install -m 775 pexorflash ../binlocal/
+       mkdir -p $(DESTDIR)/binlocal/
+       install -m 775 pexorflash $(DESTDIR)/binlocal/
        make -C kernel-module install
 
 # ------------ Dependencies --------------------------------------------

diff --git a/pexor/kernel-module/Makefile b/pexor/kernel-module/Makefile
index 0aff6aabeeb401ea719588c7677ca883f98996fd..d75db3846ecb664973c5ae6bb0177cde0391b09a 100644 (file)
--- a/pexor/kernel-module/Makefile
+++ b/pexor/kernel-module/Makefile
@@ -1,3 +1,10 @@
+
+ifndef DESTDIR
+       DESTDIR=../..
+endif
+
+# ----------------------------------------------------------------------
+
 obj-m  := pexor.o
 
 pexor-objs := pexor_trb.o 
@@ -20,8 +27,8 @@ clean:
        $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 
 install: $(TARGETS)
-       mkdir -m 2775 -p ../../kernel-modules
-       install -m 775  $(TARGETS) ../../kernel-modules/
+       mkdir -p $(DESTDIR)/kernel-modules
+       install -m 775  $(TARGETS) $(DESTDIR)/kernel-modules/
 
 # ------------ Dependencies --------------------------------------------
 

diff --git a/trbnetd/Makefile b/trbnetd/Makefile
index e1eec5292c2ef0a797658d3162915173d254b31a..125cacfb230c30af92e7cf8d0443f6735c4b3fc5 100644 (file)
--- a/trbnetd/Makefile
+++ b/trbnetd/Makefile
@@ -1,5 +1,9 @@
 # ------------ Compiler / Linker Options -------------------------------
 
+ifndef DESTDIR
+       DESTDIR=..
+endif
+
 ARCH=$(shell uname -m)
 ifeq ($(shell uname -m), x86_64)
 CPPFLAGS = -DX86_64
@@ -96,9 +100,9 @@ depend:
        $(CC) -MM $(CFLAGS) $(CPPFLAGS) $(INCDIR) *.c
 
 install: $(TARGETS) server
-       mkdir -m 2775 -p ../bin ../lib
-       install -m 775 $(TARGETS) ../bin/
-       install -m 775 $(LIB_TARGETS) ../lib/
+       mkdir  -p $(DESTDIR)/bin $(DESTDIR)/lib
+       install -m 775 $(TARGETS) $(DESTDIR)/bin/
+       install -m 664 $(LIB_TARGETS) $(DESTDIR)/lib/
        make -C server install
 
 # ------------ Dependencies --------------------------------------------

diff --git a/trbnetd/server/Makefile b/trbnetd/server/Makefile
index b1b52956144bc5e78c17d7351279e8a9c5b0778d..5fb5d135fc21007ab41e6bb5c45c48516e7a93c6 100644 (file)
--- a/trbnetd/server/Makefile
+++ b/trbnetd/server/Makefile
@@ -1,5 +1,9 @@
 # ------------ Compiler / Linker Options -------------------------------
 
+ifndef DESTDIR
+       DESTDIR=../..
+endif
+
 ifdef ETRAX
        AXIS_USABLE_LIBS = UCLIBC GLIBC
        include $(AXIS_TOP_DIR)/tools/build/Rules.axis
@@ -100,8 +104,8 @@ depend:
        $(CC) -MM $(CFLAGS) $(CPPFLAGS) $(INCDIR) *.c
 
 install: $(TARGETS)
-       mkdir -m 2775 -p ../../binlocal
-       install -m 775 $(TARGETS) ../../binlocal/
+       mkdir -p $(DESTDIR)/binlocal
+       install -m 775 $(TARGETS) $(DESTDIR)/binlocal/
 
 # ------------ Dependencies --------------------------------------------
 

diff --git a/trbrich/Makefile b/trbrich/Makefile
index 435cf57ff5b573129724e3507024a051f6294c00..e70d401639569ee8729d53b6ba50e45a8343b066 100644 (file)
--- a/trbrich/Makefile
+++ b/trbrich/Makefile
@@ -1,4 +1,9 @@
 # ------------ Compiler / Linker Options -------------------------------
+
+ifndef DESTDIR
+       DESTDIR=..
+endif
+
 ifdef ETRAX
        AXIS_USABLE_LIBS = UCLIBC GLIBC
        include $(AXIS_TOP_DIR)/tools/build/Rules.axis
@@ -88,8 +93,8 @@ depend:
        $(CC) -MM $(CFLAGS) $(CPPFLAGS) $(INCDIR) *.c
 
 install: $(TARGETS)
-       mkdir -m 2775 -p ../binlocal
-       install -m 775 $(TARGETS) ../binlocal/
+       mkdir -p $(DESTDIR)/binlocal
+       install -m 775 $(TARGETS) $(DESTDIR)/binlocal/
 
 # ------------ Dependencies --------------------------------------------