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 8f21039c1d4a601a7e9096ee4651b7ddbff8f7f5..80eb4097c459b10fca60630af6a270b348bab9fc 100644 (file)
--- 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 13c0ecb7bc5a9e5d355837e1dc31a61670ff5c60..f2f1a9ed39ce229708c168d857bc856fc707f7a9 100644 (file)
--- 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 a9befee5f71303fe31546ef53e220ac01bd47269..5886ffc0a39485fe446267642dcf30c702c30ff0 100644 (file)
--- 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 9c2d39022206dc8b5756d15ffdd5656954c1c48d..1f5a495eb02e6e11e50d1422777d0c607b11e962 100644 (file)
--- 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@