aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>1997-07-09 16:45:20 +0000
committerEric S. Raymond <esr@thyrsus.com>1997-07-09 16:45:20 +0000
commit496b49d6cf1ea45efcacf9e9742ce3e24983ded7 (patch)
tree913d08dc484e7c5600178017e7ab2a6b54d04839
parente2451c6849655dcb12ac25e354a9653e9d89e803 (diff)
downloadfetchmail-496b49d6cf1ea45efcacf9e9742ce3e24983ded7.tar.gz
fetchmail-496b49d6cf1ea45efcacf9e9742ce3e24983ded7.tar.bz2
fetchmail-496b49d6cf1ea45efcacf9e9742ce3e24983ded7.zip
Avoid a fooup due to NextStep header inclusion.
svn path=/trunk/; revision=1165
-rw-r--r--Makefile.in6
-rw-r--r--daemon.c2
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