Include path fixes.

diff --git a/bin/adv1tov2/Makefile.am b/bin/adv1tov2/Makefile.am
index c319b4339c66d3137006a51e3d17e1d104ea925b..1bfc6ca0de2920cdf17b69faa6689036e6a65c76 100644 (file)
--- a/bin/adv1tov2/Makefile.am
+++ b/bin/adv1tov2/Makefile.am
@@ -1,5 +1,7 @@
 # Makefile.am for bin/adv1tov2/
 
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys
+
 bin_PROGRAMS = adv1tov2
 
 adv1tov2_SOURCES = adv1tov2.c

diff --git a/bin/aecho/Makefile.am b/bin/aecho/Makefile.am
index 1ae6025a233293432539e8c69c3a354c5daa3a43..d3e487e9ec93896452fc3e57e9ec64f1c90a2134 100644 (file)
--- a/bin/aecho/Makefile.am
+++ b/bin/aecho/Makefile.am
@@ -1,5 +1,7 @@
 # Makefile.am for bin/aecho/
 
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys
+
 bin_PROGRAMS = aecho
 
 aecho_SOURCES = aecho.c

diff --git a/bin/afile/Makefile.am b/bin/afile/Makefile.am
index 8760d9e322a2283896445b24a5cd317139bdecaf..82bc48ccab2156a6b651855819f78073d8b76459 100644 (file)
--- a/bin/afile/Makefile.am
+++ b/bin/afile/Makefile.am
@@ -1,5 +1,7 @@
 # Makefile.am for bin/afile/
 
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys
+
 bin_PROGRAMS = afile achfile
 bin_SCRIPTS = acleandir.rc
 

diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am
index 8448efe86a6cf50b14295448a8dcd13723a8f2a9..daff8d41b8edd4e5ba288a3941c47833a972aaf7 100644 (file)
--- a/bin/afppasswd/Makefile.am
+++ b/bin/afppasswd/Makefile.am
@@ -19,8 +19,8 @@ endif
 afppasswd_SOURCES = afppasswd.c
 afppasswd_LDADD = $(top_builddir)/libatalk/libatalk.la $(CRYPT_LIBS)
 
-INCLUDES = $(CRYPT_CFLAGS) -I$(top_srcdir)/sys \
-    -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\"
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys $(CRYPT_CFLAGS) \
+       -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\"
 
 install-exec-hook:
 if USE_DHX

diff --git a/bin/getzones/Makefile.am b/bin/getzones/Makefile.am
index 1741bafca088737b799bbc5de64d6be975b5bae8..e99d41f79cd8df4b9099b65da504fe5a3c40be70 100644 (file)
--- a/bin/getzones/Makefile.am
+++ b/bin/getzones/Makefile.am
@@ -1,8 +1,8 @@
 # Makefile.am for bin/getzones/
 
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys
+
 bin_PROGRAMS = getzones
 
 getzones_SOURCES = getzones.c
 getzones_LDADD = $(top_builddir)/libatalk/libatalk.la
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/bin/megatron/Makefile.am b/bin/megatron/Makefile.am
index 275b42374632a426a62799b329e437785c6b59d2..1e1ef76233b801879bc85ce9e1a4d33ed5dcd09a 100644 (file)
--- a/bin/megatron/Makefile.am
+++ b/bin/megatron/Makefile.am
@@ -1,5 +1,7 @@
 # Makefile.am for bin/megatron/
 
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys
+
 bin_PROGRAMS = megatron
 
 megatron_SOURCES = asingle.c hqx.c macbin.c megatron.c nad.c updcrc.c

diff --git a/bin/nbp/Makefile.am b/bin/nbp/Makefile.am
index 1f82c33087e1c42fe0bf242670ddf2a710cec8f8..c369c1e101bbe9b3fbb1fc0bd778ac9cbe109485 100644 (file)
--- a/bin/nbp/Makefile.am
+++ b/bin/nbp/Makefile.am
@@ -1,5 +1,7 @@
 # Makefile.am for bin/nbp/
 
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys
+
 bin_PROGRAMS = nbplkup nbprgstr nbpunrgstr
 
 nbplkup_SOURCES = nbplkup.c

diff --git a/bin/pap/Makefile.am b/bin/pap/Makefile.am
index 671461430eee14877ac8d8ec64d94b1d013fbb3f..344cf72e7a8ad1fb08a997bf30cf378549b37dcd 100644 (file)
--- a/bin/pap/Makefile.am
+++ b/bin/pap/Makefile.am
@@ -1,5 +1,7 @@
 # Makefile.am for bin/pap/
 
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys
+
 bin_PROGRAMS = pap papstatus
 
 pap_SOURCES = pap.c

diff --git a/bin/psorder/Makefile.am b/bin/psorder/Makefile.am
index 84b8fb42ee9b59589598c57dcef06ef9b1102948..b54fa36328610da11fcba0e2683344e60549549e 100644 (file)
--- a/bin/psorder/Makefile.am
+++ b/bin/psorder/Makefile.am
@@ -1,5 +1,7 @@
 # Makefile.am for bin/psorder
 
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys
+
 bin_PROGRAMS = psorder
 
 psorder_SOURCES = psorder.c pa.c