From 36a19a059e68a075ce6555d0cd22555c697411fe Mon Sep 17 00:00:00 2001
From: sgunderson <sgunderson>
Date: Thu, 17 Aug 2000 21:50:07 +0000
Subject: [PATCH] It is now possible to build in a different directory than the
 sourcedirectory again. Also included a workaround for broken systems with a
 (wrong) config.h in the include path.

---
 Makefile.in | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index de5f217..41dad5c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,24 +8,24 @@ CC = @CC@
 VPATH = @srcdir@
 prefix = @prefix@
 
-CFLAGS = @CFLAGS@ @DEFS@ -I@srcdir@ -DVERSION=\"$(VERSION)\"
+CFLAGS = @CFLAGS@ @DEFS@ -I@srcdir@ -I. -DVERSION=\"$(VERSION)\"
 LIBS   = @LIBS@
 OBJS   = disp.o ftpd.o cmds.o nonroot.o ascii.o
 ASSMS  = disp.s ftpd.s cmds.s nonroot.s ascii.s
 CPPS   = disp.i ftpd.i cmds.i nonroot.i ascii.i
 
 # Since we use VPATH, override .c.o rule
-.c.o:	$*.c @srcdir@/config.h
+.c.o:	$*.c config.h
 	$(CC) $(CFLAGS) -c @srcdir@/$*.c
-.c.s:	$*.c @srcdir@/config.h
+.c.s:	$*.c config.h
 	$(CC) $(CFLAGS) -S @srcdir@/$*.c
 
 # deps
-cmds.o:		@srcdir@/cmds.c @srcdir@/ftpd.h @srcdir@/cmds.h @srcdir@/nonroot.h @srcdir@/config.h
-ftpd.o:		@srcdir@/ftpd.c @srcdir@/ftpd.h @srcdir@/cmds.h @srcdir@/config.h
-disp.o:		@srcdir@/disp.c @srcdir@/ftpd.h @srcdir@/config.h
-nonroot.o:	@srcdir@/nonroot.c @srcdir@/nonroot.h @srcdir@/config.h
-ascii.o:	@srcdir@/ascii.c @srcdir@/config.h
+cmds.o:		@srcdir@/cmds.c @srcdir@/ftpd.h @srcdir@/cmds.h @srcdir@/nonroot.h config.h
+ftpd.o:		@srcdir@/ftpd.c @srcdir@/ftpd.h @srcdir@/cmds.h config.h
+disp.o:		@srcdir@/disp.c @srcdir@/ftpd.h config.h
+nonroot.o:	@srcdir@/nonroot.c @srcdir@/nonroot.h config.h
+ascii.o:	@srcdir@/ascii.c config.h
 
 betaftpd: $(OBJS)
 	$(CC) $(CFLAGS) $(LIBS) -o betaftpd $(OBJS)
@@ -45,7 +45,8 @@ install: betaftpd
 	install betaftpd $(prefix)/bin/betaftpd
 
 #
-# NOTE: This is not intended for end users.
+# NOTE: This is not intended for end users, and should be run from a
+# configured BetaFTPD in the source directory only.
 #
 package:
 #	strip-exec
-- 
2.39.2