From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sun, 8 Mar 2009 18:41:06 +0000 (-0600)
Subject: Fixed subdir handling when USE_LOADABLE_MODULES is false. DIST_SUBDIRS was
X-Git-Tag: SQUID_3_2_0_1~1129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87420606e1b2ca39b7b7f249a1f163ca9aa9aa15;p=thirdparty%2Fsquid.git

Fixed subdir handling when USE_LOADABLE_MODULES is false. DIST_SUBDIRS was
defined incorrectly. Moreover, we do not need to define DIST_SUBDIRS because
the default works:

  "If `SUBDIRS' is defined conditionally using Automake conditionals,
  Automake will define `DIST_SUBDIRS' automatically from the possibles
  values of `SUBDIRS' in all conditions."

The bug was exposed by ./test-builds.sh layer-01-minimal with "make distcheck"
test added.
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 46525be49c..8cd9e72ced 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,17 +3,14 @@
 #  $Id$
 #
 
+SUBDIRS = libTrie
+
 if USE_LOADABLE_MODULES
-DIST_SUBDIRS = libLtdl
-SUBDIRS      = libLtdl
-else
-DIST_SUBDIRS =
-SUBDIRS      =
+SUBDIRS += libLtdl
 endif
 
-DIST_SUBDIRS += libTrie
-SUBDIRS      += libTrie
-CLEANFILES   =
+CLEANFILES =
+
 
 install: all
 install-strip: all