3 --- Makefile.orig 1997-10-13 11:40:34.000000000 +1000
6 ##########################################################
7 ## Where do I get installed? #############################
8 ##########################################################
9 -INSTALL_PREFIX = /usr/local/
10 +INSTALL_PREFIX = ${PREFIX}/
14 @@ -20,7 +20,7 @@ MAIL_AGENT = /usr/sbin/sendmail
15 # sendmail or whatever you are using as MAIL_AGENT above so that the user
16 # may use the "-f" flag to specify the sender of a mail message.
21 # smtpd and smtpfwdd generate lots of syslogs, by design.
23 @@ -41,7 +41,7 @@ LOG_FACILITY = LOG_MAIL
26 # The chroot directory
27 -SPOOLDIR = /usr/spool/smtpd
28 +SPOOLDIR = /var/spool/smtpd
29 # Where to store messages, relative to SPOOLDIR above.
31 #Use below instead of above if you don't want smtpd to chroot. This
32 @@ -53,7 +53,7 @@ SPOOLSUBDIR = .
34 # How frequently (in seconds) should smtpfwdd wake up to check the
35 # spool directory for new mail?
39 # What is the maximum number of children smtpfwdd should spawn at one time
40 # when delivering messages before waiting for some to complete? This ensures
41 @@ -206,8 +206,8 @@ CHECK_ADDRESS = 1
42 # build with CHECK_ADDRESS set to 1. You will get an error about
43 # juniper_firewall.h not existing if you forget this.
50 # Use regexp's in patterns? If you have a POSIX <regex.h> and friends,
51 # and you trust the regex lib enough for use, you can set USE_REGEX to
52 @@ -245,7 +245,7 @@ USE_REGEX=1
56 -LD_LIBS=-lresolv # you may or may not need this.
57 +#LD_LIBS=-lresolv # you may or may not need this.
59 # The rules file for address checking, if enabled, remember this file
60 # will be in the chroot jail, so the line below probably means
61 @@ -318,14 +318,14 @@ OPTIONS = -DMAIL_AGENT=\"$(MAIL_AGENT)\"
68 ####################################################
69 ###### Uncomment your Operating System below #######
70 ####################################################
72 # The Source is with you (*BSD 4.4, Linux)
73 -CFLAGS = -g -O -Wall -DUSE_FLOCK -DUSE_MKSTEMP $(OPTIONS)
74 +#CFLAGS = -g -O -Wall -DUSE_FLOCK -DUSE_MKSTEMP $(OPTIONS)
78 @@ -343,14 +343,15 @@ CFLAGS = -g -O -Wall -DUSE_FLOCK -DUSE_M
80 #CFLAGS = -g -O -Wall -DGETOPT_EOF -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_LOCKF_H -DNEEDS_STRINGS_H -DNEEDS_SELECT_H $(OPTIONS)
86 smtpd: smtpd.o address_check.o
87 - $(CC) -o smtpd smtpd.o address_check.o $(LD_LIBS)
88 + $(CC) $(CFLAGS) -o smtpd smtpd.o address_check.o $(LD_LIBS)
91 - $(CC) -o smtpfwdd smtpfwdd.o $(LD_LIBS)
92 + $(CC) $(CFLAGS) -o smtpfwdd smtpfwdd.o $(LD_LIBS)
94 smtpd.o: smtpd.c smtpd.h smtp.h