From a3281a2f3bd6604d02d6543bce188c9adea82708 Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Fri, 19 May 2006 23:02:14 +0000 Subject: [PATCH] fix .pkginfo line to allow the use of $(SOURCE) SVN-Revision: 3802 --- openwrt/Makefile | 8 ++++---- openwrt/package/busybox/Makefile | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/openwrt/Makefile b/openwrt/Makefile index 9b9d1c955e..9b341f1241 100644 --- a/openwrt/Makefile +++ b/openwrt/Makefile @@ -41,11 +41,11 @@ export OPENWRTVERSION all: .pkginfo: FORCE -ifeq ($(shell ./scripts/timestamp.pl -p .pkginfo package),package) +ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo) @echo Collecting package info... - @-for makefile in package/*/Makefile; do \ - echo Source-Makefile: $$makefile; \ - $(MAKE) --no-print-dir DUMP=1 -f $$makefile 2>&- || true; \ + @-for dir in package/*/; do \ + echo Source-Makefile: $${dir}Makefile; \ + $(MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \ done > $@ endif diff --git a/openwrt/package/busybox/Makefile b/openwrt/package/busybox/Makefile index ff23ee7dd8..cc36301f52 100644 --- a/openwrt/package/busybox/Makefile +++ b/openwrt/package/busybox/Makefile @@ -23,10 +23,11 @@ TITLE:=Core utilities for embedded Linux DESCRIPTION:=The Swiss Army Knife of embedded Linux. \\\ It slices, it dices, it makes Julian Fries. URL:=http://busybox.net/ -CONFIG:=menu "Configuration" \\\ - depends on PACKAGE_busybox \\\ -source "package/busybox/config/Config.in" \\\ -endmenu +CONFIG:=\\\ + menu "Configuration" \\\ + depends on PACKAGE_busybox \\\ + source "$(SOURCE)/config/Config.in" \\\ + endmenu endef define Build/Configure -- 2.25.1