X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ae7dab366c205a5358f66ba0d3d678566ccc3f29..7817b5c7113a73d33318a1174e4556c9db94deb4:/package/rules.mk?ds=sidebyside

diff --git a/package/rules.mk b/package/rules.mk
index 55066610d..5d604c504 100644
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -28,11 +28,11 @@ define Build/DefaultTargets
   $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 	$(call Build/Compile)
 	touch $$@
-    
+
   $(PKG_BUILD_DIR)/.dev-installed: $(PKG_BUILD_DIR)/.built
 	$(call Build/InstallDev)
 	touch $$@
-    
+
   package-clean: FORCE
 	$(call Build/Clean)
 	$(call Build/UninstallDev)
@@ -132,7 +132,13 @@ define BuildPackage
 	mkdir -p $$(IDIR_$(1))/CONTROL
 	echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
 	echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
-	echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control
+	( \
+		DEPENDS=; \
+		for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \
+			DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
+		done; \
+		echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \
+	)
 	echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control
 	echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control
 	echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control
@@ -147,6 +153,9 @@ define BuildPackage
   $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built
 	$(call Package/$(1)/install,$$(IDIR_$(1)))
 	mkdir -p $(PACKAGE_DIR)
+	-find $$(IDIR_$(1)) -name CVS | xargs rm -rf
+	-find $$(IDIR_$(1)) -name .svn | xargs rm -rf
+	-find $$(IDIR_$(1)) -name '.#*' | xargs rm -f
 	$(RSTRIP) $$(IDIR_$(1))
 	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
 
@@ -254,7 +263,11 @@ else
   prepare: $(PKG_BUILD_DIR)/.prepared
   configure: $(PKG_BUILD_DIR)/.configured
 
+ifdef Build/InstallDev
   compile-targets: $(PKG_BUILD_DIR)/.dev-installed
+else
+  compile-targets:
+endif
   compile: compile-targets
 
   install-targets: