diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-03 23:03:56 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-03 23:03:56 +0000 |
| commit | 947ca6f4e8cf3e67ce50d0af0f669e1099d6ea8c (patch) | |
| tree | c2e551f003a37f3f6ecb02e3d2d7aa8df554b09b /include | |
| parent | 3195575d366ffb8ceeb65296bcc29b1a514013cf (diff) | |
Tidy up Makefiles
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6857 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/scan.mk | 8 |
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 |