fix rules.mk

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3763 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/rules.mk b/package/rules.mk
index f3a1287..5711933 100644 (file)
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -18,6 +18,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
        touch $$@
 
 $(PKG_BUILD_DIR)/.built: FORCE $(PKG_BUILD_DIR)/.configured
        touch $$@
 
 $(PKG_BUILD_DIR)/.built: FORCE $(PKG_BUILD_DIR)/.configured

+#$#$#(error $$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $$(IPKG_$(1)) $(PKG_BUILD_DIR)))

 ifeq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$(PKG_BUILD_DIR))
        $(call Build/Compile)
        touch $$@
 ifeq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$(PKG_BUILD_DIR))
        $(call Build/Compile)
        touch $$@


@@ -62,11 +63,10 @@ $(foreach FIELD, TITLE CATEGORY PRIORITY VERSION, $(eval $(call RequiredField,$(
 ifeq ($(PKGARCH),)
 PKGARCH:=$(ARCH)
 endif
 ifeq ($(PKGARCH),)
 PKGARCH:=$(ARCH)
 endif

-$(eval 
+

 ifeq ($(DESCRIPTION),)
 ifeq ($(DESCRIPTION),)

-DESCRIPTION:=$(TITLE)
+$(eval DESCRIPTION:=$(TITLE))

 endif
 endif

-)

 
 IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
 IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
 
 IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
 IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)


@@ -80,8 +80,8 @@ ifeq ($(CONFIG_PACKAGE_$(1)),y)
 install-targets: $$(INFO_$(1))
 endif
 
 install-targets: $$(INFO_$(1))
 endif
 

-ifneq ($$(COMPILE_$(1)),)
-compile-targets: $$(IPKG_$(1))
+ifneq ($(COMPILE_$(1)),)
+compile-targets: $(IPKG_$(1))

 endif
 
 IDEPEND_$(1):=$$(strip $$(DEPENDS))
 endif
 
 IDEPEND_$(1):=$$(strip $$(DEPENDS))


@@ -141,7 +141,7 @@ $(1)-clean:
 clean: $(1)-clean
 
 ifneq ($(__DEFAULT_TARGETS),1)
 clean: $(1)-clean
 
 ifneq ($(__DEFAULT_TARGETS),1)

-$(eval $(call Build/DefaultTargets))
+$$(eval $$(call Build/DefaultTargets,$(1)))

 endif
 
 endef
 endif
 
 endef