X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d5583787a6d58688c00df4e4584f692df68130ce..65c17ca3e240ceb6b9b766cb8638d504b7638b40:/include/package.mk

diff --git a/include/package.mk b/include/package.mk
index bada11f13..69606464a 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -16,15 +16,6 @@ include $(INCLUDE_DIR)/unpack.mk
 
 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 
-define shvar
-V_$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
-endef
-
-define shexport
-$(call shvar,$(1))=$$(call $(1))
-export $(call shvar,$(1))
-endef
-
 define Build/DefaultTargets
   ifeq ($(DUMP),)
     ifeq ($(CONFIG_AUTOREBUILD),y)
@@ -217,11 +208,11 @@ define BuildPackage
 	echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
 	echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
 	( \
-		DEPENDS=; \
+		DEPENDS='$(EXTRA_DEPENDS)'; \
 		for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \
 			DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
 		done; \
-		echo "Depends: $(EXTRA_DEPENDS) $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \
+		echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \
 	)
 	echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control
 	echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control
@@ -289,21 +280,7 @@ define Build/Prepare
   $(call Build/Prepare/Default,)
 endef
 
-define Build/Configure/Touch
-	(cd $(PKG_BUILD_DIR) ; \
-		touch configure.in ; \
-		touch aclocal.m4 ; \
-		touch Makefile.in ; \
-		touch configure ; \
-		touch acinclude.m4 ; \
-		touch config.h.in ; \
-		touch configure.ac ; \
-		touch stamp-h.in ; \
-        );
-endef
-
 define Build/Configure/Default
-	$(call Build/Configure/Touch)
 	(cd $(PKG_BUILD_DIR)/$(strip $(3)); \
 	if [ -x configure ]; then \
 		$(TARGET_CONFIGURE_OPTS) \