X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.in;h=4cf0d1c9cb739abe5bc414425570716e30df6ff0;hb=85c74b6283f53e8deeab46354a4d3971039b6d56;hp=de5f217d7eebe3aa38e3de8de5985f0e84c6aeea;hpb=4b83f8e50792b459dfd8a6ffe470c2fccb524e7b;p=betaftpd

diff --git a/Makefile.in b/Makefile.in
index de5f217..4cf0d1c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,27 +8,28 @@ CC = @CC@
 VPATH = @srcdir@
 prefix = @prefix@
 
-CFLAGS = @CFLAGS@ @DEFS@ -I@srcdir@ -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
+CFLAGS      = @CFLAGS@
+REAL_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
-	$(CC) $(CFLAGS) -c @srcdir@/$*.c
-.c.s:	$*.c @srcdir@/config.h
-	$(CC) $(CFLAGS) -S @srcdir@/$*.c
+.c.o:	$*.c config.h
+	$(CC) $(REAL_CFLAGS) -c @srcdir@/$*.c
+.c.s:	$*.c config.h
+	$(CC) $(REAL_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)
+	$(CC) $(REAL_CFLAGS) $(LIBS) -o betaftpd $(OBJS)
 assembly-files: $(ASSMS)
 betaftpd-from-assembly-files: $(ASSMS)
 	$(CC) $(LIBS) -o betaftpd -Wl,--sort-common $(ASSMS)
@@ -42,10 +43,11 @@ distclean: clean
 	rm -f config.log config.cache config.status Makefile config.h
 
 install: betaftpd
-	install betaftpd $(prefix)/bin/betaftpd
+	install betaftpd $(prefix)/sbin/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