Put COMPILE_A2BOOT conditional into contrib/a2boot/Makefile.am, not

contrib/Makefile.am. Even if COMPILE_A2BOOT is not defined, we *must*
recurse into a2boot, so that e.g. "make dist", "make clean" or the
regeneration of Makefile.in still work properly.

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index a7fe893233a407a1d909ccb237ae236b53ed8b64..fa7b4912ac8d155a47ff58eda3294c2257ad48d6 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,12 +1,6 @@
 # Makefile.am for contrib/
-# $Id: Makefile.am,v 1.8 2003-06-08 15:21:40 srittau Exp $
+# $Id: Makefile.am,v 1.9 2003-06-08 15:57:40 srittau Exp $
 
-if COMPILE_A2BOOT
-A2BOOT = a2boot
-else
-A2BOOT =
-endif
-
-SUBDIRS = macusers nu printing shell_utils timelord ${A2BOOT}
+SUBDIRS = macusers nu printing shell_utils timelord a2boot
 
 EXTRA_DIST = ICDumpSuffixMap

diff --git a/contrib/a2boot/Makefile.am b/contrib/a2boot/Makefile.am
index fc82a9ac71f6cc0e6ed2a9f7b56092b74d59c199..d8c1cd2cbd5053bd18a15ead7455cffec3db8c17 100644 (file)
--- a/contrib/a2boot/Makefile.am
+++ b/contrib/a2boot/Makefile.am
@@ -1,12 +1,16 @@
 # Makefile.am for contrib/a2boot/
 
+if COMPILE_A2BOOT
 sbin_PROGRAMS = a2boot
+EXTRA_DIST = COPYRIGHT VERSION
+else
+sbin_PROGRAMS =
+EXTRA_DIST =
+endif
 
 a2boot_SOURCES = a2boot.c
 a2boot_LDADD = $(top_builddir)/libatalk/libatalk.la
 
-EXTRA_DIST = COPYRIGHT VERSION
-
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
         @SLP_CFLAGS@ \
         -D_PATH_A_GS_BLOCKS=\"$(PKGCONFDIR)/a2boot/ProDOS16\ Boot\ Blocks\" \