diff options
| author | Andy Green <andy@warmcat.com> | 2012-04-12 11:06:05 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-04-12 13:31:25 +0800 |
| commit | cce2a81e85d9693a83ac30e9e58f732b59759a88 (patch) | |
| tree | 244515ed454d16f98298144406f481c9eb594b31 /test-server/Makefile.in | |
| parent | a3147888d6aef9c10505e4ad1effa62930f384dc (diff) | |
change DATADIR to INSTALL_DATADIR solve mingw conflict
Based on work from Radu Sorici <soriciradu@gmail.com>
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'test-server/Makefile.in')
| -rw-r--r-- | test-server/Makefile.in | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/test-server/Makefile.in b/test-server/Makefile.in index f13f9de..5beb753 100644 --- a/test-server/Makefile.in +++ b/test-server/Makefile.in @@ -256,36 +256,40 @@ libwebsockets_test_fraggle_SOURCES = test-fraggle.c libwebsockets_test_fraggle_LDADD = -L../lib -lwebsockets \ $(am__append_4) @MINGW_FALSE@libwebsockets_test_server_CFLAGS := -Werror -Wall \ -@MINGW_FALSE@ -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" \ +@MINGW_FALSE@ -std=gnu99 -pedantic \ +@MINGW_FALSE@ -DINSTALL_DATADIR=\"@datadir@\" \ @MINGW_FALSE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" @MINGW_TRUE@libwebsockets_test_server_CFLAGS := -w \ @MINGW_TRUE@ -I../win32port/win32helpers -Wall -std=gnu99 \ -@MINGW_TRUE@ -pedantic -DDATADIR=\"@datadir@\" \ +@MINGW_TRUE@ -pedantic -DINSTALL_DATADIR=\"@datadir@\" \ @MINGW_TRUE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" @MINGW_FALSE@libwebsockets_test_client_CFLAGS := -Werror -Wall \ -@MINGW_FALSE@ -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" \ +@MINGW_FALSE@ -std=gnu99 -pedantic \ +@MINGW_FALSE@ -DINSTALL_DATADIR=\"@datadir@\" \ @MINGW_FALSE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" @MINGW_TRUE@libwebsockets_test_client_CFLAGS := -w \ @MINGW_TRUE@ -I../win32port/win32helpers -Wall -std=gnu99 \ -@MINGW_TRUE@ -pedantic -DDATADIR=\"@datadir@\" \ +@MINGW_TRUE@ -pedantic -DINSTALL_DATADIR=\"@datadir@\" \ @MINGW_TRUE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" @MINGW_FALSE@libwebsockets_test_server_extpoll_CFLAGS := -Werror -Wall \ -@MINGW_FALSE@ -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" \ +@MINGW_FALSE@ -std=gnu99 -pedantic \ +@MINGW_FALSE@ -DINSTALL_DATADIR=\"@datadir@\" \ @MINGW_FALSE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" @MINGW_TRUE@libwebsockets_test_server_extpoll_CFLAGS := -w \ @MINGW_TRUE@ -I../win32port/win32helpers -Wall -std=gnu99 \ -@MINGW_TRUE@ -pedantic -DDATADIR=\"@datadir@\" \ +@MINGW_TRUE@ -pedantic -DINSTALL_DATADIR=\"@datadir@\" \ @MINGW_TRUE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" @MINGW_FALSE@libwebsockets_test_fraggle_CFLAGS := -Werror -Wall \ -@MINGW_FALSE@ -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" \ +@MINGW_FALSE@ -std=gnu99 -pedantic \ +@MINGW_FALSE@ -DINSTALL_DATADIR=\"@datadir@\" \ @MINGW_FALSE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" @MINGW_TRUE@libwebsockets_test_fraggle_CFLAGS := -w \ @MINGW_TRUE@ -I../win32port/win32helpers -Wall -std=gnu99 \ -@MINGW_TRUE@ -pedantic -DDATADIR=\"@datadir@\" \ +@MINGW_TRUE@ -pedantic -DINSTALL_DATADIR=\"@datadir@\" \ @MINGW_TRUE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" @NOPING_FALSE@libwebsockets_test_ping_SOURCES = test-ping.c @NOPING_FALSE@libwebsockets_test_ping_LDADD = -L../lib -lwebsockets -@NOPING_FALSE@libwebsockets_test_ping_CFLAGS := -Wall -Werror -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" +@NOPING_FALSE@libwebsockets_test_ping_CFLAGS := -Wall -Werror -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" all: all-am .SUFFIXES: |