Skip to content
Snippets Groups Projects
Commit be9cc65a authored by Mike Baker's avatar Mike Baker
Browse files

fix rules.mk

SVN-Revision: 3763
parent a94c4640
No related branches found
No related tags found
No related merge requests found
...@@ -18,6 +18,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared ...@@ -18,6 +18,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
touch $$@ touch $$@
$(PKG_BUILD_DIR)/.built: FORCE $(PKG_BUILD_DIR)/.configured $(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)) ifeq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$(PKG_BUILD_DIR))
$(call Build/Compile) $(call Build/Compile)
touch $$@ touch $$@
...@@ -62,11 +63,10 @@ $(foreach FIELD, TITLE CATEGORY PRIORITY VERSION, $(eval $(call RequiredField,$( ...@@ -62,11 +63,10 @@ $(foreach FIELD, TITLE CATEGORY PRIORITY VERSION, $(eval $(call RequiredField,$(
ifeq ($(PKGARCH),) ifeq ($(PKGARCH),)
PKGARCH:=$(ARCH) PKGARCH:=$(ARCH)
endif endif
$(eval
ifeq ($(DESCRIPTION),) ifeq ($(DESCRIPTION),)
DESCRIPTION:=$(TITLE) $(eval DESCRIPTION:=$(TITLE))
endif endif
)
IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
...@@ -80,8 +80,8 @@ ifeq ($(CONFIG_PACKAGE_$(1)),y) ...@@ -80,8 +80,8 @@ ifeq ($(CONFIG_PACKAGE_$(1)),y)
install-targets: $$(INFO_$(1)) install-targets: $$(INFO_$(1))
endif endif
ifneq ($$(COMPILE_$(1)),) ifneq ($(COMPILE_$(1)),)
compile-targets: $$(IPKG_$(1)) compile-targets: $(IPKG_$(1))
endif endif
IDEPEND_$(1):=$$(strip $$(DEPENDS)) IDEPEND_$(1):=$$(strip $$(DEPENDS))
...@@ -141,7 +141,7 @@ $(1)-clean: ...@@ -141,7 +141,7 @@ $(1)-clean:
clean: $(1)-clean clean: $(1)-clean
ifneq ($(__DEFAULT_TARGETS),1) ifneq ($(__DEFAULT_TARGETS),1)
$(eval $(call Build/DefaultTargets)) $$(eval $$(call Build/DefaultTargets,$(1)))
endif endif
endef endef
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment