fix cross-compilation

Don't add -I$(includedir) to CPPFLAGS or cross-compilation will fail on:

libtool: compile: /home/fabrice/buildroot/output/host/bin/m68k-linux-gcc -DHAVE_CONFIG_H -I. -I.. -I/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -fno-dwarf2-cfi-asm -Wl,-elf2flt -c regparse.c -o regparse.o
m68k-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include'

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

diff --git a/sample/Makefile.am b/sample/Makefile.am
index fd809fa7d2534d7d54b30407a47dbedb5b62cce5..320afcf747a87ec52cbb4e6a9405d6ab363cff91 100644 (file)
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -4,7 +4,7 @@ lib_onig = ../src/libonig.la
 LDADD  = $(lib_onig)
 
 AM_LDFLAGS  = -L$(prefix)/lib
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(includedir)
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 TESTS = encode listcap names posix simple sql syntax user_property callout echo count bug_fix
 

diff --git a/src/Makefile.am b/src/Makefile.am
index ba7807afa1dd2f59b79ec4f5608641c35377059c..1330620187799ace7142c64dc62302e15781b1d4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 libname = libonig.la
 
 AM_CFLAGS = -Wall
-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 include_HEADERS = oniguruma.h oniggnu.h
 

diff --git a/test/Makefile.am b/test/Makefile.am
index c623aa39d1c2f8d10bdc5447c65ae02ac52400b0..67b5d1e4c454004ec6d8cd2d49c7006ce9ffd2f0 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -3,7 +3,7 @@ lib_onig = ../src/libonig.la
 
 AM_LDFLAGS  = -L$(prefix)/lib
 AM_CFLAGS = -Wall -Wno-invalid-source-encoding
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(includedir)
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 if ENABLE_POSIX_API
 TESTS = test_utf8 testc testp testcu