Improved icetime PREFIX handling

This commit is contained in:
Clifford Wolf 2016-01-23 14:10:26 +01:00
parent b1475b9c07
commit da6ad20dba
2 changed files with 2 additions and 5 deletions

View File

@ -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)"'
all: icetime

View File

@ -31,9 +31,6 @@
// add this number of ns as estimate for clock distribution mismatch
#define GLOBAL_CLK_DIST_JITTER 0.1
#define STRINGIFY(x) #x
#define TOSTRING(x) STRINGIFY(x)
FILE *fin = nullptr, *fout = nullptr, *frpt = nullptr;
bool verbose = false;
bool max_span_hack = false;
@ -268,7 +265,7 @@ void read_config()
void read_chipdb()
{
char buffer[1024];
snprintf(buffer, 1024, TOSTRING(PREFIX) "/share/icebox/chipdb-%s.txt", config_device.c_str());
snprintf(buffer, 1024, PREFIX "/share/icebox/chipdb-%s.txt", config_device.c_str());
FILE *fdb = fopen(buffer, "r");
if (fdb == nullptr) {