aboutsummaryrefslogtreecommitdiffstats
path: root/include
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
commit23efe5fc834671d6d2842630ec28ed829a298fe9 (patch)
treedc0a4deb91f74428e18271e1f4b2082f08e1380f /include
parentda8174507aad3763465d31a3de34f6765057bc18 (diff)
downloadupstream-23efe5fc834671d6d2842630ec28ed829a298fe9.tar.gz
upstream-23efe5fc834671d6d2842630ec28ed829a298fe9.tar.bz2
upstream-23efe5fc834671d6d2842630ec28ed829a298fe9.zip
Tidy up Makefiles
SVN-Revision: 6857
Diffstat (limited to 'include')
-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