--- a/Makefile +++ b/Makefile @@ -18,3 +18,24 @@ tgz: make clean ( cd .. && tar --exclude=rgeany -cvzf asix.tgz asix ) + +prefix := /usr/local +exec_prefix := $(prefix) +bindir := $(exec_prefix)/bin +libdir := $(exec_prefix)/lib +includedir := $(prefix)/include +datarootdir := $(prefix)/share +INSTALL_BIN_DIR := $(DESTDIR)/$(bindir) +INSTALL_LIB_DIR := $(DESTDIR)/$(libdir)/asix +INSTALL_INCLUDE_DIR := $(DESTDIR)/$(includedir)/asix +INSTALL_SHARE_DIR := $(DESTDIR)/$(datarootdir)/asix + +install: all + install -d $(INSTALL_BIN_DIR) + install -m 755 asix $(INSTALL_BIN_DIR) + install -d $(INSTALL_LIB_DIR) + cp -r lib/. $(INSTALL_LIB_DIR) + install -d $(INSTALL_INCLUDE_DIR) + cp -r src/. $(INSTALL_INCLUDE_DIR) + install -d $(INSTALL_SHARE_DIR) + cp -r examples $(INSTALL_SHARE_DIR) --- a/asix +++ b/asix @@ -20,7 +20,8 @@ PROG_NAME=$(readlink -f $0) #INSTALL_DIR=$(readlink -f $(dirname $(dirname $PROG_NAME))) -INSTALL_DIR=$(readlink -f $(dirname $PROG_NAME)) +INSTALL_DIR="/usr/include/asix" +LIB_DIR="/usr/lib/asix" [ -d /home/IUT/gudavala/bin ] && PATH="$PATH:/home/IUT/gudavala/bin" @@ -134,8 +135,8 @@ while [ $# -gt 1 ]; do case "$1" in -b|-board|--board) [ $2 = "list" ] && { - cd $INSTALL_DIR/src/boards; ls -1; exit 0; } - [ ! -d $INSTALL_DIR/src/boards/$2 ] && \ + cd $INSTALL_DIR/boards; ls -1; exit 0; } + [ ! -d $INSTALL_DIR/boards/$2 ] && \ error "Board $2 not defined !" BOARD=$2 shift @@ -159,7 +160,7 @@ shift done - set -a; . $INSTALL_DIR/src/boards/$BOARD/$BOARD.sh; set +a + set -a; . $INSTALL_DIR/boards/$BOARD/$BOARD.sh; set +a case "$1" in -h|-help|--help) help; exit 0;; @@ -249,9 +250,9 @@ ORIENTATION=$o fi - INCLUDE_DIRS="-I$INSTALL_DIR/src -I$INSTALL_DIR/src/tone -I$INSTALL_DIR/src/rtc \ - -I$INSTALL_DIR/src/x11 -I$INSTALL_DIR/src/boards/$BOARD -I$INSTALL_DIR/src/tft \ - -I$INSTALL_DIR/src/Adafruit_ZeroTimer -I$INSTALL_DIR/src/LIS3DHTR + INCLUDE_DIRS="-I$INSTALL_DIR -I$INSTALL_DIR/tone -I$INSTALL_DIR/rtc \ + -I$INSTALL_DIR/x11 -I$INSTALL_DIR/boards/$BOARD -I$INSTALL_DIR/tft \ + -I$INSTALL_DIR/Adafruit_ZeroTimer -I$INSTALL_DIR/LIS3DHTR " #-I$INSTALL_DIR/src/lvgl -I$INSTALL_DIR/src/lvgl/src \ @@ -285,7 +286,7 @@ #ls -l $TMP_OBJ #nm $TMP_OBJ - cmd="$CC -o $TMP_EXE $TMP_OBJ -flto -Wl,-rpath,$INSTALL_DIR/lib -L$INSTALL_DIR/lib $LIBS" + cmd="$CC -o $TMP_EXE $TMP_OBJ -flto -Wl,-rpath,$LIB_DIR -L$LIB_DIR $LIBS" echo $cmd $cmd r=$? @@ -304,7 +305,7 @@ #echo #echo "done" - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL_DIR/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_DIR" } return $r