From 80e4f6a6e04582fe11c98e6133e3e306e5556d8d Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Sat, 4 Oct 2014 15:39:08 -0500 Subject: makefile: Rename DATADIR to not conflict with Win32 define Signed-off-by: Michael Cronenworth --- Makefile.am | 2 +- trust/module.c | 2 +- trust/test-module.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index ea87f6a..f310068 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/common \ -DBINDIR=\"$(bindir)\" \ -DBUILDDIR=\"$(abs_builddir)\" \ - -DDATADIR=\"$(datadir)\" \ + -DDATA_DIR=\"$(datadir)\" \ -DPRIVATEDIR=\"$(privatedir)\" \ -DSRCDIR=\"$(abs_srcdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ diff --git a/trust/module.c b/trust/module.c index 852d74f..7fce465 100644 --- a/trust/module.c +++ b/trust/module.c @@ -196,7 +196,7 @@ create_tokens_inlock (p11_array *tokens, const char *label; } labels[] = { { "~/", "User Trust" }, - { DATADIR, "Default Trust" }, + { DATA_DIR, "Default Trust" }, { SYSCONFDIR, "System Trust" }, { NULL }, }; diff --git a/trust/test-module.c b/trust/test-module.c index 3eedc1b..b1ee5fd 100644 --- a/trust/test-module.c +++ b/trust/test-module.c @@ -315,7 +315,7 @@ test_get_token_info (void) memset (&args, 0, sizeof (args)); args.pReserved = "paths='" \ SYSCONFDIR "/trust/input" P11_PATH_SEP \ - DATADIR "/trust/fixtures/blah" P11_PATH_SEP \ + DATA_DIR "/trust/fixtures/blah" P11_PATH_SEP \ "/some/other/path/the-basename'"; args.flags = CKF_OS_LOCKING_OK; -- cgit v1.1