luke
/
icestorm
mirror of https://github.com/YosysHQ/icestorm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58 from set-soft/master 

Added a new config variable CHIPDB_SUBDIR.
This commit is contained in:
Clifford Wolf 2016-10-14 09:21:23 +02:00 committed by GitHub
parent fbd7b6c169 1fb08362d9
commit 1796d4354f
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.mk
View File

@ -3,6 +3,7 @@ CC ?= $(CXX)
PKG_CONFIG ?= pkg-config PKG_CONFIG ?= pkg-config
DESTDIR ?= DESTDIR ?=
PREFIX ?= /usr/local PREFIX ?= /usr/local
CHIPDB_SUBDIR ?= icebox
ifeq ($(MXE),1) ifeq ($(MXE),1)
EXE = .exe EXE = .exe

2
icetime/Makefile
View File

@ -1,6 +1,6 @@
include ../config.mk include ../config.mk
LDLIBS = -lm -lstdc++ 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) ifeq ($(STATIC),1)
LDFLAGS += -static LDFLAGS += -static

4
icetime/icetime.cc
View File

@ -295,9 +295,9 @@ void read_chipdb()
#else #else
homedir += getenv("HOME"); homedir += getenv("HOME");
#endif #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 } 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"); FILE *fdb = fopen(buffer, "r");
if (fdb == nullptr) { if (fdb == nullptr) {