Avoid a fooup due to NextStep header inclusion.

svn path=/trunk/; revision=1165

diff --git a/Makefile.in b/Makefile.in
index 72397ef9cd8a6877b403b017b68af6fe30b19728..afb478fa448497c7c7e25447da8a99b9b7d9f0ef 100644 (file)
--- 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 985fe65b5e3e763048506c0c5debdae4091903fc..941017b1ec7e24ffdbbde47c88a10d2bb10cd871 100644 (file)
--- 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