diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-08-20 15:48:41 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-08-20 15:48:41 +0000 |
| commit | 2244492d6abbcd035681fbc530e6583df62f1d95 (patch) | |
| tree | 856248290f8876dea1a5437208a74689dfb0fb67 /include | |
| parent | 1490881f66a0d16a62a5d4c361abfaed4d192980 (diff) | |
| download | master-187ad058-2244492d6abbcd035681fbc530e6583df62f1d95.tar.gz master-187ad058-2244492d6abbcd035681fbc530e6583df62f1d95.tar.bz2 master-187ad058-2244492d6abbcd035681fbc530e6583df62f1d95.zip | |
merge the control file and the .ipk file targets into one to prevent them from going out of sync
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17332 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/package-ipkg.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 245e29fa5d..904bbd75af 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -57,7 +57,14 @@ ifeq ($(DUMP),) $(eval $(call BuildIPKGVariable,$(1),postinst)) $(eval $(call BuildIPKGVariable,$(1),prerm)) $(eval $(call BuildIPKGVariable,$(1),postrm)) - $$(IDIR_$(1))/CONTROL/control: $(STAMP_BUILT) + + $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT) + mkdir -p $(STAGING_DIR_ROOT)/stamp + $(call Package/$(1)/install,$(STAGING_DIR_ROOT)) + $(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT)) + touch $$@ + + $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT) @rm -f $(PACKAGE_DIR)/$(1)_* rm -rf $$(IDIR_$(1)) mkdir -p $$(IDIR_$(1))/CONTROL @@ -82,16 +89,7 @@ ifeq ($(DUMP),) (cd $$(IDIR_$(1))/CONTROL; \ $($(1)_COMMANDS) \ ) - - $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT) - mkdir -p $(STAGING_DIR_ROOT)/stamp - $(call Package/$(1)/install,$(STAGING_DIR_ROOT)) - $(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT)) - touch $$@ - - $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT) $$(IDIR_$(1))/CONTROL/control $(call Package/$(1)/install,$$(IDIR_$(1))) - mkdir -p $$(IDIR_$(1))/CONTROL mkdir -p $(PACKAGE_DIR) -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf $(RSTRIP) $$(IDIR_$(1)) |