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

diff --git a/Makefile.in b/Makefile.in
index de5f217..cdc7f5d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-VERSION=0.0.8pre17-dev
+VERSION=0.0.8pre18
 
 # main target
 all: betaftpd
@@ -8,27 +8,29 @@ 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@
+CPPFLAGS    = @DEFS@ -I@srcdir@ -I. -DVERSION=\"$(VERSION)\"
+LIBS        = @LIBS@
+OBJS        = disp.o ftpd.o cmds.o nonroot.o ascii.o dcache.o
+ASSMS       = ${OBJS:.o=.s}
+CPPS        = ${OBJS:.o=.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) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/$*.c
+.c.s:	$*.c config.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -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 @srcdir@/dcache.h config.h
+ftpd.o:		@srcdir@/ftpd.c @srcdir@/ftpd.h @srcdir@/cmds.h @srcdir@/dcache.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 @srcdir@/ascii.h config.h
+dcache.o:	@srcdir@/dcache.c @srcdir@/dcache.h config.h
 
 betaftpd: $(OBJS)
-	$(CC) $(CFLAGS) $(LIBS) -o betaftpd $(OBJS)
+	$(CC) $(CFLAGS) -o betaftpd $(OBJS) $(LIBS)
 assembly-files: $(ASSMS)
 betaftpd-from-assembly-files: $(ASSMS)
 	$(CC) $(LIBS) -o betaftpd -Wl,--sort-common $(ASSMS)
@@ -42,25 +44,34 @@ 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
 	rm -rf betaftpd-$(VERSION)
 	mkdir betaftpd-$(VERSION)
 	mkdir betaftpd-$(VERSION)/doc
+	mkdir betaftpd-$(VERSION)/debian
 #	cp betaftpd betaftpd-$(VERSION)
 	make distclean
 	autoconf
 	autoheader configure.in > config.h.in
-	cp README Makefile.in acconfig.h cmds.c cmds.h betaftpd-$(VERSION)
+	@echo "The user packaging this package didn't have cvs2cl.pl available," > ChangeLog
+	@echo "or he/she was offline during packaging. No ChangeLog is available." >> ChangeLog
+	-cvs2cl.pl -U users
+	cp ChangeLog README Makefile.in acconfig.h cmds.c cmds.h betaftpd-$(VERSION)
 	cp config.h.in configure configure.in disp.c ftpd.c betaftpd-$(VERSION)
-	cp nonroot.c ascii.c ascii.h nonroot.h ftpd.h strip-exec betaftpd.lsm betaftpd-$(VERSION)
+	cp nonroot.c ascii.c ascii.h nonroot.h ftpd.h betaftpd-$(VERSION)
+	cp dcache.c dcache.h strip-exec betaftpd.lsm betaftpd-$(VERSION)
 	cp doc/CREDITS doc/CHANGES doc/CHANGES-0.0.8 doc/COPYING betaftpd-$(VERSION)/doc
 	cp doc/KNOWN-BUGS doc/RFC-COMPLIANCE doc/README.nonroot betaftpd-$(VERSION)/doc
 	cp doc/README.rights doc/README.platforms betaftpd-$(VERSION)/doc
+	cp debian/README.debian debian/betaftpd.7 debian/changelog betaftpd-$(VERSION)/debian
+	cp debian/control debian/copyright debian/dirs betaftpd-$(VERSION)/debian
+	cp debian/init.d debian/rules debian/watch.ex betaftpd-$(VERSION)/debian
 	tar cf - betaftpd-$(VERSION)/ | gzip -9vv > betaftpd-$(VERSION).tar.gz
-	tar cf - betaftpd-$(VERSION)/ | bzip2 -3vv > betaftpd-$(VERSION).tar.bz2
+	tar cf - betaftpd-$(VERSION)/ | bzip2 -4vv > betaftpd-$(VERSION).tar.bz2