--- src.orig/lmtp/Makefile.in	Thu Jul 11 11:56:34 2002
+++ src/lmtp/Makefile.in	Thu Jul 11 14:16:45 2002
@@ -10,12 +10,12 @@
 WARN	= -W -Wformat -Wimplicit -Wmissing-prototypes \
 	-Wparentheses -Wstrict-prototypes -Wswitch -Wuninitialized \
 	-Wunused
-DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
+DEFS	= -I. -I$(INC_DIR) -I/usr/include/postfix -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= quote_821_local
 PROG	= lmtp
 INC_DIR	= ../../include
-LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libdns.a ../../lib/libutil.a
+LIBS	= -lpostfix-master -lpostfix-global -lpostfix-dns -lpostfix-util ../../lib/libtlsglobal.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -38,7 +38,7 @@
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=/usr/include/postfix" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -62,183 +62,183 @@
 
 # do not edit below this line - it is generated by 'make depend'
 lmtp.o: lmtp.c
-lmtp.o: ../../include/sys_defs.h
-lmtp.o: ../../include/dict.h
-lmtp.o: ../../include/vstream.h
-lmtp.o: ../../include/vbuf.h
-lmtp.o: ../../include/argv.h
-lmtp.o: ../../include/msg.h
-lmtp.o: ../../include/mymalloc.h
-lmtp.o: ../../include/name_mask.h
-lmtp.o: ../../include/split_at.h
-lmtp.o: ../../include/deliver_request.h
-lmtp.o: ../../include/vstring.h
-lmtp.o: ../../include/recipient_list.h
-lmtp.o: ../../include/mail_queue.h
-lmtp.o: ../../include/mail_params.h
-lmtp.o: ../../include/mail_conf.h
-lmtp.o: ../../include/debug_peer.h
-lmtp.o: ../../include/mail_error.h
-lmtp.o: ../../include/mail_server.h
+lmtp.o: /usr/include/postfix/sys_defs.h
+lmtp.o: /usr/include/postfix/dict.h
+lmtp.o: /usr/include/postfix/vstream.h
+lmtp.o: /usr/include/postfix/vbuf.h
+lmtp.o: /usr/include/postfix/argv.h
+lmtp.o: /usr/include/postfix/msg.h
+lmtp.o: /usr/include/postfix/mymalloc.h
+lmtp.o: /usr/include/postfix/name_mask.h
+lmtp.o: /usr/include/postfix/split_at.h
+lmtp.o: /usr/include/postfix/deliver_request.h
+lmtp.o: /usr/include/postfix/vstring.h
+lmtp.o: /usr/include/postfix/recipient_list.h
+lmtp.o: /usr/include/postfix/mail_queue.h
+lmtp.o: /usr/include/postfix/mail_params.h
+lmtp.o: /usr/include/postfix/mail_conf.h
+lmtp.o: /usr/include/postfix/debug_peer.h
+lmtp.o: /usr/include/postfix/mail_error.h
+lmtp.o: /usr/include/postfix/mail_server.h
 lmtp.o: lmtp.h
 lmtp.o: lmtp_sasl.h
 lmtp_addr.o: lmtp_addr.c
-lmtp_addr.o: ../../include/sys_defs.h
-lmtp_addr.o: ../../include/msg.h
-lmtp_addr.o: ../../include/vstring.h
-lmtp_addr.o: ../../include/vbuf.h
-lmtp_addr.o: ../../include/mymalloc.h
-lmtp_addr.o: ../../include/inet_addr_list.h
-lmtp_addr.o: ../../include/stringops.h
-lmtp_addr.o: ../../include/mail_params.h
-lmtp_addr.o: ../../include/own_inet_addr.h
-lmtp_addr.o: ../../include/dns.h
+lmtp_addr.o: /usr/include/postfix/sys_defs.h
+lmtp_addr.o: /usr/include/postfix/msg.h
+lmtp_addr.o: /usr/include/postfix/vstring.h
+lmtp_addr.o: /usr/include/postfix/vbuf.h
+lmtp_addr.o: /usr/include/postfix/mymalloc.h
+lmtp_addr.o: /usr/include/postfix/inet_addr_list.h
+lmtp_addr.o: /usr/include/postfix/stringops.h
+lmtp_addr.o: /usr/include/postfix/mail_params.h
+lmtp_addr.o: /usr/include/postfix/own_inet_addr.h
+lmtp_addr.o: /usr/include/postfix/dns.h
 lmtp_addr.o: lmtp.h
-lmtp_addr.o: ../../include/vstream.h
-lmtp_addr.o: ../../include/argv.h
-lmtp_addr.o: ../../include/deliver_request.h
-lmtp_addr.o: ../../include/recipient_list.h
+lmtp_addr.o: /usr/include/postfix/vstream.h
+lmtp_addr.o: /usr/include/postfix/argv.h
+lmtp_addr.o: /usr/include/postfix/deliver_request.h
+lmtp_addr.o: /usr/include/postfix/recipient_list.h
 lmtp_addr.o: lmtp_addr.h
 lmtp_chat.o: lmtp_chat.c
-lmtp_chat.o: ../../include/sys_defs.h
-lmtp_chat.o: ../../include/msg.h
-lmtp_chat.o: ../../include/vstring.h
-lmtp_chat.o: ../../include/vbuf.h
-lmtp_chat.o: ../../include/vstream.h
-lmtp_chat.o: ../../include/argv.h
-lmtp_chat.o: ../../include/stringops.h
-lmtp_chat.o: ../../include/line_wrap.h
-lmtp_chat.o: ../../include/mymalloc.h
-lmtp_chat.o: ../../include/recipient_list.h
-lmtp_chat.o: ../../include/deliver_request.h
-lmtp_chat.o: ../../include/smtp_stream.h
-lmtp_chat.o: ../../include/mail_params.h
-lmtp_chat.o: ../../include/mail_addr.h
-lmtp_chat.o: ../../include/post_mail.h
-lmtp_chat.o: ../../include/cleanup_user.h
-lmtp_chat.o: ../../include/mail_error.h
-lmtp_chat.o: ../../include/name_mask.h
+lmtp_chat.o: /usr/include/postfix/sys_defs.h
+lmtp_chat.o: /usr/include/postfix/msg.h
+lmtp_chat.o: /usr/include/postfix/vstring.h
+lmtp_chat.o: /usr/include/postfix/vbuf.h
+lmtp_chat.o: /usr/include/postfix/vstream.h
+lmtp_chat.o: /usr/include/postfix/argv.h
+lmtp_chat.o: /usr/include/postfix/stringops.h
+lmtp_chat.o: /usr/include/postfix/line_wrap.h
+lmtp_chat.o: /usr/include/postfix/mymalloc.h
+lmtp_chat.o: /usr/include/postfix/recipient_list.h
+lmtp_chat.o: /usr/include/postfix/deliver_request.h
+lmtp_chat.o: /usr/include/postfix/smtp_stream.h
+lmtp_chat.o: /usr/include/postfix/mail_params.h
+lmtp_chat.o: /usr/include/postfix/mail_addr.h
+lmtp_chat.o: /usr/include/postfix/post_mail.h
+lmtp_chat.o: /usr/include/postfix/cleanup_user.h
+lmtp_chat.o: /usr/include/postfix/mail_error.h
+lmtp_chat.o: /usr/include/postfix/name_mask.h
 lmtp_chat.o: lmtp.h
 lmtp_connect.o: lmtp_connect.c
-lmtp_connect.o: ../../include/sys_defs.h
-lmtp_connect.o: ../../include/msg.h
-lmtp_connect.o: ../../include/vstream.h
-lmtp_connect.o: ../../include/vbuf.h
-lmtp_connect.o: ../../include/vstring.h
-lmtp_connect.o: ../../include/split_at.h
-lmtp_connect.o: ../../include/mymalloc.h
-lmtp_connect.o: ../../include/iostuff.h
-lmtp_connect.o: ../../include/timed_connect.h
-lmtp_connect.o: ../../include/stringops.h
-lmtp_connect.o: ../../include/mail_params.h
-lmtp_connect.o: ../../include/mail_proto.h
-lmtp_connect.o: ../../include/attr.h
-lmtp_connect.o: ../../include/dns.h
+lmtp_connect.o: /usr/include/postfix/sys_defs.h
+lmtp_connect.o: /usr/include/postfix/msg.h
+lmtp_connect.o: /usr/include/postfix/vstream.h
+lmtp_connect.o: /usr/include/postfix/vbuf.h
+lmtp_connect.o: /usr/include/postfix/vstring.h
+lmtp_connect.o: /usr/include/postfix/split_at.h
+lmtp_connect.o: /usr/include/postfix/mymalloc.h
+lmtp_connect.o: /usr/include/postfix/iostuff.h
+lmtp_connect.o: /usr/include/postfix/timed_connect.h
+lmtp_connect.o: /usr/include/postfix/stringops.h
+lmtp_connect.o: /usr/include/postfix/mail_params.h
+lmtp_connect.o: /usr/include/postfix/mail_proto.h
+lmtp_connect.o: /usr/include/postfix/attr.h
+lmtp_connect.o: /usr/include/postfix/dns.h
 lmtp_connect.o: lmtp.h
-lmtp_connect.o: ../../include/argv.h
-lmtp_connect.o: ../../include/deliver_request.h
-lmtp_connect.o: ../../include/recipient_list.h
+lmtp_connect.o: /usr/include/postfix/argv.h
+lmtp_connect.o: /usr/include/postfix/deliver_request.h
+lmtp_connect.o: /usr/include/postfix/recipient_list.h
 lmtp_connect.o: lmtp_addr.h
 lmtp_proto.o: lmtp_proto.c
-lmtp_proto.o: ../../include/sys_defs.h
-lmtp_proto.o: ../../include/msg.h
-lmtp_proto.o: ../../include/vstring.h
-lmtp_proto.o: ../../include/vbuf.h
-lmtp_proto.o: ../../include/vstream.h
-lmtp_proto.o: ../../include/vstring_vstream.h
-lmtp_proto.o: ../../include/stringops.h
-lmtp_proto.o: ../../include/mymalloc.h
-lmtp_proto.o: ../../include/mail_params.h
-lmtp_proto.o: ../../include/smtp_stream.h
-lmtp_proto.o: ../../include/mail_queue.h
-lmtp_proto.o: ../../include/recipient_list.h
-lmtp_proto.o: ../../include/deliver_request.h
-lmtp_proto.o: ../../include/deliver_completed.h
-lmtp_proto.o: ../../include/defer.h
-lmtp_proto.o: ../../include/bounce.h
-lmtp_proto.o: ../../include/sent.h
-lmtp_proto.o: ../../include/record.h
-lmtp_proto.o: ../../include/rec_type.h
-lmtp_proto.o: ../../include/off_cvt.h
-lmtp_proto.o: ../../include/mark_corrupt.h
-lmtp_proto.o: ../../include/quote_821_local.h
-lmtp_proto.o: ../../include/quote_flags.h
+lmtp_proto.o: /usr/include/postfix/sys_defs.h
+lmtp_proto.o: /usr/include/postfix/msg.h
+lmtp_proto.o: /usr/include/postfix/vstring.h
+lmtp_proto.o: /usr/include/postfix/vbuf.h
+lmtp_proto.o: /usr/include/postfix/vstream.h
+lmtp_proto.o: /usr/include/postfix/vstring_vstream.h
+lmtp_proto.o: /usr/include/postfix/stringops.h
+lmtp_proto.o: /usr/include/postfix/mymalloc.h
+lmtp_proto.o: /usr/include/postfix/mail_params.h
+lmtp_proto.o: /usr/include/postfix/smtp_stream.h
+lmtp_proto.o: /usr/include/postfix/mail_queue.h
+lmtp_proto.o: /usr/include/postfix/recipient_list.h
+lmtp_proto.o: /usr/include/postfix/deliver_request.h
+lmtp_proto.o: /usr/include/postfix/deliver_completed.h
+lmtp_proto.o: /usr/include/postfix/defer.h
+lmtp_proto.o: /usr/include/postfix/bounce.h
+lmtp_proto.o: /usr/include/postfix/sent.h
+lmtp_proto.o: /usr/include/postfix/record.h
+lmtp_proto.o: /usr/include/postfix/rec_type.h
+lmtp_proto.o: /usr/include/postfix/off_cvt.h
+lmtp_proto.o: /usr/include/postfix/mark_corrupt.h
+lmtp_proto.o: /usr/include/postfix/quote_821_local.h
+lmtp_proto.o: /usr/include/postfix/quote_flags.h
 lmtp_proto.o: lmtp.h
-lmtp_proto.o: ../../include/argv.h
+lmtp_proto.o: /usr/include/postfix/argv.h
 lmtp_proto.o: lmtp_sasl.h
 lmtp_sasl_glue.o: lmtp_sasl_glue.c
-lmtp_sasl_glue.o: ../../include/sys_defs.h
-lmtp_sasl_glue.o: ../../include/msg.h
-lmtp_sasl_glue.o: ../../include/mymalloc.h
-lmtp_sasl_glue.o: ../../include/stringops.h
-lmtp_sasl_glue.o: ../../include/vstring.h
-lmtp_sasl_glue.o: ../../include/vbuf.h
-lmtp_sasl_glue.o: ../../include/split_at.h
-lmtp_sasl_glue.o: ../../include/name_mask.h
-lmtp_sasl_glue.o: ../../include/mail_params.h
-lmtp_sasl_glue.o: ../../include/string_list.h
-lmtp_sasl_glue.o: ../../include/match_list.h
-lmtp_sasl_glue.o: ../../include/match_ops.h
-lmtp_sasl_glue.o: ../../include/maps.h
-lmtp_sasl_glue.o: ../../include/dict.h
-lmtp_sasl_glue.o: ../../include/vstream.h
-lmtp_sasl_glue.o: ../../include/argv.h
+lmtp_sasl_glue.o: /usr/include/postfix/sys_defs.h
+lmtp_sasl_glue.o: /usr/include/postfix/msg.h
+lmtp_sasl_glue.o: /usr/include/postfix/mymalloc.h
+lmtp_sasl_glue.o: /usr/include/postfix/stringops.h
+lmtp_sasl_glue.o: /usr/include/postfix/vstring.h
+lmtp_sasl_glue.o: /usr/include/postfix/vbuf.h
+lmtp_sasl_glue.o: /usr/include/postfix/split_at.h
+lmtp_sasl_glue.o: /usr/include/postfix/name_mask.h
+lmtp_sasl_glue.o: /usr/include/postfix/mail_params.h
+lmtp_sasl_glue.o: /usr/include/postfix/string_list.h
+lmtp_sasl_glue.o: /usr/include/postfix/match_list.h
+lmtp_sasl_glue.o: /usr/include/postfix/match_ops.h
+lmtp_sasl_glue.o: /usr/include/postfix/maps.h
+lmtp_sasl_glue.o: /usr/include/postfix/dict.h
+lmtp_sasl_glue.o: /usr/include/postfix/vstream.h
+lmtp_sasl_glue.o: /usr/include/postfix/argv.h
 lmtp_sasl_glue.o: lmtp.h
-lmtp_sasl_glue.o: ../../include/deliver_request.h
-lmtp_sasl_glue.o: ../../include/recipient_list.h
+lmtp_sasl_glue.o: /usr/include/postfix/deliver_request.h
+lmtp_sasl_glue.o: /usr/include/postfix/recipient_list.h
 lmtp_sasl_glue.o: lmtp_sasl.h
 lmtp_sasl_proto.o: lmtp_sasl_proto.c
-lmtp_sasl_proto.o: ../../include/sys_defs.h
-lmtp_sasl_proto.o: ../../include/msg.h
-lmtp_sasl_proto.o: ../../include/mymalloc.h
-lmtp_sasl_proto.o: ../../include/mail_params.h
+lmtp_sasl_proto.o: /usr/include/postfix/sys_defs.h
+lmtp_sasl_proto.o: /usr/include/postfix/msg.h
+lmtp_sasl_proto.o: /usr/include/postfix/mymalloc.h
+lmtp_sasl_proto.o: /usr/include/postfix/mail_params.h
 lmtp_sasl_proto.o: lmtp.h
-lmtp_sasl_proto.o: ../../include/vstream.h
-lmtp_sasl_proto.o: ../../include/vbuf.h
-lmtp_sasl_proto.o: ../../include/vstring.h
-lmtp_sasl_proto.o: ../../include/argv.h
-lmtp_sasl_proto.o: ../../include/deliver_request.h
-lmtp_sasl_proto.o: ../../include/recipient_list.h
+lmtp_sasl_proto.o: /usr/include/postfix/vstream.h
+lmtp_sasl_proto.o: /usr/include/postfix/vbuf.h
+lmtp_sasl_proto.o: /usr/include/postfix/vstring.h
+lmtp_sasl_proto.o: /usr/include/postfix/argv.h
+lmtp_sasl_proto.o: /usr/include/postfix/deliver_request.h
+lmtp_sasl_proto.o: /usr/include/postfix/recipient_list.h
 lmtp_sasl_proto.o: lmtp_sasl.h
 lmtp_session.o: lmtp_session.c
-lmtp_session.o: ../../include/sys_defs.h
-lmtp_session.o: ../../include/mymalloc.h
-lmtp_session.o: ../../include/vstream.h
-lmtp_session.o: ../../include/vbuf.h
-lmtp_session.o: ../../include/stringops.h
-lmtp_session.o: ../../include/vstring.h
-lmtp_session.o: ../../include/debug_peer.h
+lmtp_session.o: /usr/include/postfix/sys_defs.h
+lmtp_session.o: /usr/include/postfix/mymalloc.h
+lmtp_session.o: /usr/include/postfix/vstream.h
+lmtp_session.o: /usr/include/postfix/vbuf.h
+lmtp_session.o: /usr/include/postfix/stringops.h
+lmtp_session.o: /usr/include/postfix/vstring.h
+lmtp_session.o: /usr/include/postfix/debug_peer.h
 lmtp_session.o: lmtp.h
-lmtp_session.o: ../../include/argv.h
-lmtp_session.o: ../../include/deliver_request.h
-lmtp_session.o: ../../include/recipient_list.h
+lmtp_session.o: /usr/include/postfix/argv.h
+lmtp_session.o: /usr/include/postfix/deliver_request.h
+lmtp_session.o: /usr/include/postfix/recipient_list.h
 lmtp_state.o: lmtp_state.c
-lmtp_state.o: ../../include/sys_defs.h
-lmtp_state.o: ../../include/mymalloc.h
-lmtp_state.o: ../../include/vstring.h
-lmtp_state.o: ../../include/vbuf.h
-lmtp_state.o: ../../include/vstream.h
-lmtp_state.o: ../../include/mail_conf.h
+lmtp_state.o: /usr/include/postfix/sys_defs.h
+lmtp_state.o: /usr/include/postfix/mymalloc.h
+lmtp_state.o: /usr/include/postfix/vstring.h
+lmtp_state.o: /usr/include/postfix/vbuf.h
+lmtp_state.o: /usr/include/postfix/vstream.h
+lmtp_state.o: /usr/include/postfix/mail_conf.h
 lmtp_state.o: lmtp.h
-lmtp_state.o: ../../include/argv.h
-lmtp_state.o: ../../include/deliver_request.h
-lmtp_state.o: ../../include/recipient_list.h
+lmtp_state.o: /usr/include/postfix/argv.h
+lmtp_state.o: /usr/include/postfix/deliver_request.h
+lmtp_state.o: /usr/include/postfix/recipient_list.h
 lmtp_state.o: lmtp_sasl.h
 lmtp_trouble.o: lmtp_trouble.c
-lmtp_trouble.o: ../../include/sys_defs.h
-lmtp_trouble.o: ../../include/msg.h
-lmtp_trouble.o: ../../include/vstring.h
-lmtp_trouble.o: ../../include/vbuf.h
-lmtp_trouble.o: ../../include/stringops.h
-lmtp_trouble.o: ../../include/mymalloc.h
-lmtp_trouble.o: ../../include/smtp_stream.h
-lmtp_trouble.o: ../../include/vstream.h
-lmtp_trouble.o: ../../include/deliver_request.h
-lmtp_trouble.o: ../../include/recipient_list.h
-lmtp_trouble.o: ../../include/deliver_completed.h
-lmtp_trouble.o: ../../include/bounce.h
-lmtp_trouble.o: ../../include/defer.h
-lmtp_trouble.o: ../../include/mail_error.h
-lmtp_trouble.o: ../../include/name_mask.h
+lmtp_trouble.o: /usr/include/postfix/sys_defs.h
+lmtp_trouble.o: /usr/include/postfix/msg.h
+lmtp_trouble.o: /usr/include/postfix/vstring.h
+lmtp_trouble.o: /usr/include/postfix/vbuf.h
+lmtp_trouble.o: /usr/include/postfix/stringops.h
+lmtp_trouble.o: /usr/include/postfix/mymalloc.h
+lmtp_trouble.o: /usr/include/postfix/smtp_stream.h
+lmtp_trouble.o: /usr/include/postfix/vstream.h
+lmtp_trouble.o: /usr/include/postfix/deliver_request.h
+lmtp_trouble.o: /usr/include/postfix/recipient_list.h
+lmtp_trouble.o: /usr/include/postfix/deliver_completed.h
+lmtp_trouble.o: /usr/include/postfix/bounce.h
+lmtp_trouble.o: /usr/include/postfix/defer.h
+lmtp_trouble.o: /usr/include/postfix/mail_error.h
+lmtp_trouble.o: /usr/include/postfix/name_mask.h
 lmtp_trouble.o: lmtp.h
-lmtp_trouble.o: ../../include/argv.h
+lmtp_trouble.o: /usr/include/postfix/argv.h
