Currently, "make install" commands install headers into /usr/include directory. It may cause conflict or override of header files. This patch fixes to install headers into /usr/include/accord directory. Signed-off-by: OZAWA Tsuyoshi <ozawa.tsuyoshi at lab.ntt.co.jp> --- apps/queue/queue.c | 2 +- include/Makefile | 2 +- include/accord.h | 2 +- libacrd/libacrd.pc.in | 2 +- test/acrdbench.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/queue/queue.c b/apps/queue/queue.c index 7e92b25..8d5e81f 100644 --- a/apps/queue/queue.c +++ b/apps/queue/queue.c @@ -3,7 +3,7 @@ #include <pthread.h> #include <sys/time.h> -#include <accord.h> +#include <accord/accord.h> #include "util.h" #include "coroutine.h" #include "adler32.c" diff --git a/include/Makefile b/include/Makefile index 2e50dcd..7d0a311 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -includedir ?= $(PREFIX)/include +includedir ?= $(PREFIX)/include/accord HEADERS = accord.h accord_proto.h diff --git a/include/accord.h b/include/accord.h index 3fff476..41f7839 100644 --- a/include/accord.h +++ b/include/accord.h @@ -1,7 +1,7 @@ #ifndef __ACCORD_H__ #define __ACCORD_H__ -#include <accord_proto.h> +#include <accord/accord_proto.h> struct acrd_handle; struct acrd_tx; diff --git a/libacrd/libacrd.pc.in b/libacrd/libacrd.pc.in index 4e07509..29e55dd 100644 --- a/libacrd/libacrd.pc.in +++ b/libacrd/libacrd.pc.in @@ -1,7 +1,7 @@ prefix=@PREFIX@ exec_prefix=${prefix} libdir=@LIBDIR@ -includedir=${prefix}/include +includedir=${prefix}/include/accord Name: libacrd Version: @VERSION@ diff --git a/test/acrdbench.c b/test/acrdbench.c index 9c7baf1..94beb99 100644 --- a/test/acrdbench.c +++ b/test/acrdbench.c @@ -22,7 +22,7 @@ #include <limits.h> #include <pthread.h> -#include <accord.h> +#include <accord/accord.h> #include "util.h" #define dprintf(fmt, args...) \ -- 1.7.2.5 |