From 7fc4e63e1df72c45f45d4fd8f54015ab9ec46320 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Tue, 27 Mar 2012 00:18:24 +0200 Subject: [PATCH 1/1] Removed hard-coded -I.. and -I../.. from INCLUDES. It was redundant given -I$(top_srcdir). Merged from nmh. Thanks to David Levine. --- config/Makefile.in | 2 +- sbr/Makefile.in | 2 +- sbr/pidstatus.c | 2 +- uip/Makefile.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 +#include "sigmsg.h" #include #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@ -- 1.7.10.4