From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 11 Aug 2012 13:52:15 +0000 (+0200)
Subject: [ng] dist: fixup: honour DIST_SUBDIRS rather than SUBDIRS in conditionals
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d5c01345c418620c08d24e1bc87a5e3fe692be0;p=thirdparty%2Fautomake.git

[ng] dist: fixup: honour DIST_SUBDIRS rather than SUBDIRS in conditionals

Regression introduced in recent patches, and revealed by a failure in
test 't/subpkg2.sh'.

* lib/am/distdir.mk: Here, throughout the file.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/lib/am/distdir.mk b/lib/am/distdir.mk
index 53b3c4f88..6359df6ef 100644
--- a/lib/am/distdir.mk
+++ b/lib/am/distdir.mk
@@ -117,7 +117,7 @@ am.dist.post-remove-distdir = $(am.dist.remove-distdir)
 
 endif # am.conf.is-topdir
 
-ifdef SUBDIRS
+ifdef DIST_SUBDIRS
 # Computes a relative pathname RELDIR such that DIR1/RELDIR = DIR2.
 # Input:
 #   - dir1      relative pathname, relative to the current directory.
@@ -149,10 +149,10 @@ am.dist.relativize-path = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-endif # SUBDIRS
+endif # DIST_SUBDIRS
 
 .PHONY: distdir
-ifdef SUBDIR
+ifdef DIST_SUBDIRS
 AM_RECURSIVE_TARGETS += distdir
 endif
 
@@ -224,7 +224,7 @@ endif
 ## at the top level do the right thing.  If we're in the topmost
 ## directory, then we use 'distdir' instead of 'top_distdir'; this lets
 ## us work correctly with an enclosing package.
-ifdef SUBDIRS
+ifdef DIST_SUBDIRS
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    $(am.make.dry-run) \
@@ -252,7 +252,7 @@ ifdef SUBDIRS
 	      || exit 1; \
 	  fi; \
 	done
-endif # SUBDIRS
+endif # DIST_SUBDIRS
 ##
 ## We might have to perform some last second updates, such as updating
 ## info files.