image.in, build-*: generalize SUBDIRS

This is a fix to previous failures of
ve/vm + use/repo/main build attempts
(in fact, any non-distro/ targets).

SUBDIRS were just optimized away...

features.in/build-distro/lib/90-build-distro.mk

@@ -1,9 +1,5 @@
 # step 4: build the distribution image
 
-# take the latter part for complex-specified subprofiles like stage2@live;
-# care to exclude non-directories holding no makefiles like rootfs
-SUBDIRS = $(sort $(dir $(wildcard $(addsuffix /Makefile,$(SUBPROFILE_DIRS)))))
-
 # proxy over the ISO metadata collected; see also genisoimagerc(5)
 BOOT_SYSI := $(META_SYSTEM_ID)
 BOOT_PUBL := $(META_PUBLISHER)

features.in/build-ve/lib/90-build-ve.mk

@@ -20,5 +20,6 @@ IMAGE_PACKAGES = $(DOT_BASE) \
 IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
                         $(BASE_PACKAGES_REGEXP)
 
-all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
+all: $(GLOBAL_DEBUG) \
+	build-image copy-subdirs copy-tree run-image-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)

features.in/build-vm/lib/90-build-vm.mk

@@ -55,5 +55,6 @@ run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
 # override
 pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL)
 
-all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
+all: $(GLOBAL_DEBUG) \
+	build-image copy-subdirs copy-tree run-image-scripts pack-image \
 	convert-image postprocess $(GLOBAL_CLEAN_WORKDIR)

image.in/Makefile

@@ -56,6 +56,10 @@ CLEANUP_OUTDIR ?=
 GLOBAL_TARGET := $(ARCH)
 GLOBAL_HSH_APT_CONFIG := $(wildcard $(APTCONF))
 
+# take the latter part for complex-specified subprofiles like stage2@live;
+# care to exclude non-directories holding no makefiles like rootfs
+SUBDIRS = $(sort $(dir $(wildcard $(addsuffix /Makefile,$(SUBPROFILE_DIRS)))))
+
 # the lib/build-*.mk comes from features.in/build-*/lib
 include $(sort $(wildcard lib/*.mk))
 include $(MKIMAGE_PREFIX)/targets.mk