aboutsummaryrefslogtreecommitdiffstats
path: root/include/scan.mk
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2007-04-03 23:03:56 +0000
committerMike Baker <mbm@openwrt.org>2007-04-03 23:03:56 +0000
commit0f8b8ec000d3ce1d84e9caf0bfb0e7f1103c1836 (patch)
treec2e551f003a37f3f6ecb02e3d2d7aa8df554b09b /include/scan.mk
parent29f0b44895e039792bcc0166b031adbba485986f (diff)
downloadupstream-0f8b8ec000d3ce1d84e9caf0bfb0e7f1103c1836.tar.gz
upstream-0f8b8ec000d3ce1d84e9caf0bfb0e7f1103c1836.tar.bz2
upstream-0f8b8ec000d3ce1d84e9caf0bfb0e7f1103c1836.zip
Tidy up Makefiles
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6857 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include/scan.mk')
-rw-r--r--include/scan.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/scan.mk b/include/scan.mk
index aa7c2e74b5..5bbfce566e 100644
--- a/include/scan.mk
+++ b/include/scan.mk
@@ -1,6 +1,6 @@
include $(TOPDIR)/include/verbose.mk
-SCAN_TARGET ?= pkginfo
+SCAN_TARGET ?= packageinfo
SCAN_NAME ?= package
SCAN_DIR ?= package
SCAN_DEPS ?= include/package.mk
@@ -15,7 +15,7 @@ else
endef
endif
-SCAN = $(patsubst $(SCAN_DIR)/%/Makefile,%,$(shell ls $(SCAN_DIR)/*/Makefile))
+SCAN = $(patsubst $(SCAN_DIR)/%/Makefile,%,$(wildcard $(SCAN_DIR)/*/Makefile))
tmp/.$(SCAN_TARGET):
@($(call progress,Collecting $(SCAN_NAME) info: merging...))
for file in $(SCAN); do \
@@ -32,8 +32,8 @@ $(SCAN_STAMP):
endif
# FIXME: generate this dynamically?
-ifeq ($(SCAN_TARGET),pkginfo)
-tmp/info/.pkginfo-kernel: $(shell ls package/kernel/modules/*.mk)
+ifeq ($(SCAN_TARGET),packageinfo)
+tmp/info/.packageinfo-kernel: $(wildcard package/kernel/modules/*.mk)
endif
define scanfiles