$NetBSD: patch-aa,v 1.4 2006/02/19 17:23:18 adrianp Exp $

--- Makefile.in.orig	2006-02-12 02:11:06.000000000 +0000
+++ Makefile.in
@@ -169,7 +169,7 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = -O2 -Wall -g \
+CFLAGS += \
 	-DPATH_HONEYDINCLUDE="\"$(honeydincludedir)\"" \
 	-DPATH_HONEYDDATA="\"$(honeyddatadir)\"" \
 	-DPATH_HONEYDLIB="\"$(honeydlibdir)\"" \
@@ -321,10 +321,10 @@ libhoneyddir = $(libdir)/honeyd
 libhoneyd_DATA = libhoneyd.so
 
 # Configuration files for Honeyd
-honeyddatadir = $(datadir)/honeyd
+honeyddatadir = $(datadir)/examples/honeyd
 honeydlibdir = $(libdir)/honeyd
 honeydincludedir = $(includedir)/honeyd
-honeyddata_DATA = README nmap.assoc xprobe2.conf nmap.prints config.sample \
+honeyddata_DATA = nmap.assoc xprobe2.conf nmap.prints config.sample \
 		config.ethernet pf.os
 
 honeydplugins = @PLUGINS@
@@ -364,7 +364,7 @@ honeydstats_LDADD = @LIBOBJS@ @DNETLIB@ 
 honeydstats_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
 	@EVENTINC@ @DNETINC@ @ZINC@ @DNSRESINC@
 
-honeydstats_CFLAGS = -O0 -Wall
+honeydstats_CFLAGS =
 
 #
 # Honeyd control application
@@ -372,7 +372,7 @@ honeydstats_CFLAGS = -O0 -Wall
 honeydctl_SOURCES = honeydctl.c
 honeydctl_LDADD = @LIBOBJS@ @EDITLIB@ @LIBCURSES@
 honeydctl_CPPFLAGS = @EDITINC@
-honeydctl_CFLAGS = -O2 -Wall
+honeydctl_CFLAGS =
 INCLUDES = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
 	@PYTHONINC@ @EVENTINC@ @PCAPINC@ @DNETINC@ @ZINC@
 
@@ -387,7 +387,7 @@ smtp_LDADD = @LIBOBJS@ @EVENTLIB@ @DNETL
 smtp_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
 	@EVENTINC@ @DNETINC@ @DNSRESINC@ @PCREINC@
 
-smtp_CFLAGS = -O2 -Wall
+smtp_CFLAGS =
 proxy_SOURCES = subsystems/proxy.c subsystems/proxy.h subsystems/proxy_main.c \
 	subsystems/proxy_messages.h subsystems/smtp.c subsystems/smtp.h \
 	subsystems/smtp_messages.h atomicio.c \
@@ -397,7 +397,7 @@ proxy_LDADD = @LIBOBJS@ @EVENTLIB@ @DNET
 proxy_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
 	@EVENTINC@ @DNETINC@ @DNSRESINC@ @PCREINC@
 
-proxy_CFLAGS = -O2 -Wall
+proxy_CFLAGS =
 
 ########################################################################
 ########################################################################