From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 19 Mar 2009 03:13:10 +0000 (+1200)
Subject: Author: Alex Rousskov <rousskov@measurement-factory.com>
X-Git-Tag: SQUID_3_1_0_7~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dca395f330cf1cf637e46cedabde8bad36580a70;p=thirdparty%2Fsquid.git

Author: Alex Rousskov <rousskov@measurement-factory.com>
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