1From fbc9b7c3b83a99ac996c0a268487d1f800630328 Mon Sep 17 00:00:00 2001
2From: Julien Viard de Galbert <julien@vdg.name>
3Date: Wed, 8 Feb 2017 21:26:58 +0100
4Subject: [PATCH] Do not use includedir as include search path for build
5
6--includedir is not used to specify where a program should
7look for headers of libraries, but to tell where it should
8install its own headers.
9
10Signed-off-by: Julien Viard de Galbert <julien@vdg.name>
11---
12 configure.ac             | 6 +++---
13 dieharder/Makefile.am    | 2 +-
14 libdieharder/Makefile.am | 2 +-
15 3 files changed, 5 insertions(+), 5 deletions(-)
16
17diff --git a/configure.ac b/configure.ac
18index b336115..91f7c64 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -96,9 +96,9 @@ AC_TYPE_SIZE_T
22 AC_C_VOLATILE
23 AC_C_INLINE
24
25-DIEHARDER_CFLAGS="-I$includedir"
26-dieharder_CFLAGS="-std=c99 -Wall -pedantic -I$includedir"
27-libdieharder_lo_CFLAGS="-Wall -pedantic -I$includedir"
28+DIEHARDER_CFLAGS=""
29+dieharder_CFLAGS="-std=c99 -Wall -pedantic"
30+libdieharder_lo_CFLAGS="-Wall -pedantic"
31 DIEHARDER_LIBS="-L$libdir -ldieharder"
32 ACLOCAL_AMFLAGS="-I m4"
33
34diff --git a/dieharder/Makefile.am b/dieharder/Makefile.am
35index e6fbff2..7bdac5c 100644
36--- a/dieharder/Makefile.am
37+++ b/dieharder/Makefile.am
38@@ -64,7 +64,7 @@ DEFINES = -DVERSION=$(VERSION)
39 # CC = gcc
40
41 # Compile flags (use fairly standard -O3 as default)
42-AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES) -I ${includedir}
43+AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES)
44 AM_CFLAGS = -O3
45
46 # Load flags (optional)
47diff --git a/libdieharder/Makefile.am b/libdieharder/Makefile.am
48index 5fd3396..0873f9c 100644
49--- a/libdieharder/Makefile.am
50+++ b/libdieharder/Makefile.am
51@@ -114,7 +114,7 @@ DEFINES = -DVERSION=$(VERSION) -DLITTLE_ENDIAN=$(LITTLE_ENDIAN)
52 # CC = gcc
53
54 # Compile flags (use fairly standard -O3 as default)
55-AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include -I ${includedir}
56+AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include
57 AM_CFLAGS = -O3 -Wall -pedantic -Wno-unused-variable
58
59 #========================================================================
60--
612.1.4
62
63