diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | riff/main.h | 2 | ||||
| -rw-r--r-- | riff/riff.mk | 3 |
3 files changed, 7 insertions, 6 deletions
@@ -1,14 +1,16 @@ # Makefile - riff +DESTDIR := +PREFIX := /usr + .PHONY: all all: \ CDAL \ riff - .PHONY: riff riff: CDAL - cd riff/ && $(MAKE) -f riff.mk + cd riff/ && $(MAKE) -f riff.mk PREFIX=$(PREFIX) .PHONY: CDAL CDAL: @@ -49,8 +51,6 @@ debian: clean all rm -rf debian rm -rf doc/man/temp -DESTDIR := -PREFIX := /usr INSTDIR = $(DESTDIR)$(PREFIX) .PHONY: install diff --git a/riff/main.h b/riff/main.h index 7826eb4..916e523 100644 --- a/riff/main.h +++ b/riff/main.h @@ -31,7 +31,7 @@ enum ConnectionType { Logger* logger_; Config* config_; -char configFile[PATH_LENGTH] = "/usr/share/riff/config"; +char configFile[PATH_LENGTH] = RIFF_CONFIG_PREFIX "/share/riff/config"; char flashimage[PATH_LENGTH] = "\0"; char address[PATH_LENGTH] = "0"; char length[PATH_LENGTH] = "0"; diff --git a/riff/riff.mk b/riff/riff.mk index f083879..b81d343 100644 --- a/riff/riff.mk +++ b/riff/riff.mk @@ -1,7 +1,8 @@ # Makefile - riff +PREFIX := /usr CXX=g++ -CFLAGS=-I../os_wrappers -I../CDAL -D_FILE_OFFSET_BITS=64 +CFLAGS=-I../os_wrappers -I../CDAL -D_FILE_OFFSET_BITS=64 -DRIFF_CONFIG_PREFIX=\"$(PREFIX)\" CXXFLAGS=$(CFLAGS) LD=$(CXX) $(CXXFLAGS) LDFLAGS=-L../CDAL |