From 496b49d6cf1ea45efcacf9e9742ce3e24983ded7 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Wed, 9 Jul 1997 16:45:20 +0000
Subject: Avoid a fooup due to NextStep header inclusion.

svn path=/trunk/; revision=1165
---
 Makefile.in | 6 +++---
 daemon.c    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 72397ef9..afb478fa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -114,7 +114,7 @@ rfc822: rfc822.c
 .l.o:
 	$(LEX) $(LEXFLAGS) $<
 	mv lex.yy.c $*.c
-	$(CC) $(defines) -c -I. -I$(srcdir) $(CFLAGS) $*.c $(OUTPUT_OPTION)
+	$(CC) $(defines) -c -I$(srcdir) $(CFLAGS) $*.c $(OUTPUT_OPTION)
 
 .l.c:
 	$(LEX) $(LEXFLAGS) $<
@@ -125,7 +125,7 @@ rfc822: rfc822.c
 	$(YACC) $(YACCFLAGS) $<
 	mv y.tab.c $*.c
 	mv -f y.tab.h $*.h
-	$(CC) $(defines) -c -I. -I$(srcdir) $(CFLAGS) $*.c $(OUTPUT_OPTION)
+	$(CC) $(defines) -c -I$(srcdir) $(CFLAGS) $*.c $(OUTPUT_OPTION)
 
 .y.c:
 	$(YACC) $(YACCFLAGS) $<
@@ -176,7 +176,7 @@ mostlyclean: clean
 Makefile: config.status $(srcdir)/Makefile.in
 	$(SHELL) config.status
 	@echo "You can ignore any makedepend error messages"
-	-makedepend -I. -fMakefile *.c
+	-makedepend -I$(srcdir) -fMakefile *.c
 
 config.h: stamp-config 
 
diff --git a/daemon.c b/daemon.c
index 985fe65b..941017b1 100644
--- a/daemon.c
+++ b/daemon.c
@@ -31,7 +31,7 @@
 #include <unix.h>
 #endif
 
-#if defined(HAVE_SGTTY_H)
+#if !defined(TIOCNOTTY) && defined(HAVE_SGTTY_H)
 #  include <sgtty.h>		/* for TIOCNOTTY under NEXTSTEP */
 #endif
 
-- 
cgit v1.2.3