candump: add option -e to dump error messages in human readable format

[sojka/can-utils.git] / Makefile

diff --git a/Makefile b/Makefile
index 3475376c8933211c2c9137bd4a5a2b1ba9af733a..2c75e42c518a5c6afa01b023d5ab2798fe1a516b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,9 @@
 #
 #  Send feedback to <socketcan-users@lists.berlios.de>
 
+DESTDIR =
+PREFIX = /usr/local
+
 KERNELDIR = ../kernel/2.6
 
 MAKEFLAGS = -k
@@ -50,10 +53,16 @@ CFLAGS    = -O2 -Wall -Wno-parentheses -I$(KERNELDIR)/include \
            -DPF_CAN=29 \
            -DAF_CAN=PF_CAN
 
-PROGRAMS = candump cansniffer cansend canplayer canlogserver cangen\
-          canbusload log2long log2asc asc2log bcmserver\
-          isotpdump isotprecv isotpsend isotpsniffer isotptun\
-          slcan_attach slcand slcanpty canfdtest cangw
+PROGRAMS_ISOTP = isotpdump isotprecv isotpsend isotpsniffer isotptun isotpserver
+PROGRAMS_CANGW = cangw
+PROGRAMS_SLCAN = slcan_attach slcand
+PROGRAMS = can-calc-bit-timing candump cansniffer cansend canplayer cangen canbusload\
+          log2long log2asc asc2log\
+          canlogserver bcmserver\
+          $(PROGRAMS_ISOTP)\
+          $(PROGRAMS_CANGW)\
+          $(PROGRAMS_SLCAN)\
+          slcanpty canfdtest
 
 all: $(PROGRAMS)
 
@@ -61,7 +70,8 @@ clean:
        rm -f $(PROGRAMS) *.o
 
 install:
-       cp -f $(PROGRAMS) /usr/local/bin
+       mkdir -p $(DESTDIR)$(PREFIX)/bin
+       cp -f $(PROGRAMS) $(DESTDIR)$(PREFIX)/bin
 
 distclean:
        rm -f $(PROGRAMS) *.o *~