diff options
| author | Clifford Wolf <clifford@clifford.at> | 2016-10-14 09:21:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 09:21:23 +0200 |
| commit | 1796d4354f47fbcacd61054e47435d7f0fc2b7fe (patch) | |
| tree | a725f909663c5f39d132c0f28f9693ce7675e04b | |
| parent | fbd7b6c169bb1313340a20574e1e6e00e706f59c (diff) | |
| parent | 1fb08362d9bf5efcaea31247969ea65d3618e62a (diff) | |
| download | icestorm-1796d4354f47fbcacd61054e47435d7f0fc2b7fe.tar.gz icestorm-1796d4354f47fbcacd61054e47435d7f0fc2b7fe.tar.bz2 icestorm-1796d4354f47fbcacd61054e47435d7f0fc2b7fe.zip | |
Merge pull request #58 from set-soft/master
Added a new config variable CHIPDB_SUBDIR.
| -rw-r--r-- | config.mk | 1 | ||||
| -rw-r--r-- | icetime/Makefile | 2 | ||||
| -rw-r--r-- | icetime/icetime.cc | 4 |
3 files changed, 4 insertions, 3 deletions
@@ -3,6 +3,7 @@ CC ?= $(CXX) PKG_CONFIG ?= pkg-config DESTDIR ?= PREFIX ?= /usr/local +CHIPDB_SUBDIR ?= icebox ifeq ($(MXE),1) EXE = .exe diff --git a/icetime/Makefile b/icetime/Makefile index c56002b..cfa7ff0 100644 --- a/icetime/Makefile +++ b/icetime/Makefile @@ -1,6 +1,6 @@ include ../config.mk LDLIBS = -lm -lstdc++ -CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include -DPREFIX='"$(PREFIX)"' +CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include -DPREFIX='"$(PREFIX)"' -DCHIPDB_SUBDIR='"$(CHIPDB_SUBDIR)"' ifeq ($(STATIC),1) LDFLAGS += -static diff --git a/icetime/icetime.cc b/icetime/icetime.cc index 84ee8cc..8b21b80 100644 --- a/icetime/icetime.cc +++ b/icetime/icetime.cc @@ -295,9 +295,9 @@ void read_chipdb() #else homedir += getenv("HOME"); #endif - snprintf(buffer, 1024, "%s%s/share/icebox/chipdb-%s.txt", homedir.c_str(), PREFIX+1, config_device.c_str()); + snprintf(buffer, 1024, "%s%s/share/" CHIPDB_SUBDIR "/chipdb-%s.txt", homedir.c_str(), PREFIX+1, config_device.c_str()); } else - snprintf(buffer, 1024, "%s/share/icebox/chipdb-%s.txt", PREFIX, config_device.c_str()); + snprintf(buffer, 1024, PREFIX "/share/" CHIPDB_SUBDIR "/chipdb-%s.txt", config_device.c_str()); FILE *fdb = fopen(buffer, "r"); if (fdb == nullptr) { |