From: markus schnalke <meillo@marmaro.de>
Date: Mon, 26 Mar 2012 22:18:24 +0000 (+0200)
Subject: Removed hard-coded -I.. and -I../.. from INCLUDES.
X-Git-Tag: mmh-thesis-end~172
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=7fc4e63e1df72c45f45d4fd8f54015ab9ec46320;p=mmh

Removed hard-coded -I.. and -I../.. from INCLUDES.
It was redundant given -I$(top_srcdir).

Merged from nmh. Thanks to David Levine.
---

diff --git a/config/Makefile.in b/config/Makefile.in
index 8f21039..80eb409 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -23,7 +23,7 @@ mailspool      = @mailspool@
 CC         = @CC@
 CFLAGS     = @CFLAGS@
 DEFS       = @DEFS@
-INCLUDES   = -I.. -I$(top_srcdir) @CPPFLAGS@
+INCLUDES   = -I$(top_srcdir) @CPPFLAGS@
 CONFIGDEFS = -DNMHETCDIR='"$(etcdir)"' \
 		-DSENDMAILPATH='"$(sendmailpath)"' \
 		-DMAILSPOOL='"$(mailspool)"'
diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index 13c0ecb..f2f1a9e 100644
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -17,7 +17,7 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
-INCLUDES = -I.. -I. -I$(top_srcdir) @CPPFLAGS@
+INCLUDES = -I$(top_srcdir) @CPPFLAGS@
 
 LEX    = @LEX@
 AWK    = @AWK@
diff --git a/sbr/pidstatus.c b/sbr/pidstatus.c
index a9befee..5886ffc 100644
--- a/sbr/pidstatus.c
+++ b/sbr/pidstatus.c
@@ -11,7 +11,7 @@
 /*
 ** auto-generated header
 */
-#include <sigmsg.h>
+#include "sigmsg.h"
 #include <sys/wait.h>
 
 #ifndef WTERMSIG
diff --git a/uip/Makefile.in b/uip/Makefile.in
index 9c2d390..1f5a495 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -17,7 +17,7 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
+INCLUDES = -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@