makefile: Rename DATADIR to not conflict with Win32 define

Signed-off-by: Michael Cronenworth <mike@cchtml.com>

diff --git a/Makefile.am b/Makefile.am
index ea87f6ab787fde50abeb1e222ff52d79178c535b..f31006881bf492c1d11cac28c302ce1791e951d3 100644 (file)
--- 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 852d74fc08e80632e3433ca4eeaac0b467c2b0af..7fce46542ab603d21d4c6651b653f801aaf459ec 100644 (file)
--- 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 3eedc1be6a9f5074c67bd34a68bb889fa46dc1b3..b1ee5fd121879848665df45dcdc288185744cf0a 100644 (file)
--- 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;