fix busybox build

[openwrt.git] / package / rules.mk

diff --git a/package/rules.mk b/package/rules.mk
index 50f03ef..5d604c5 100644 (file)
--- 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)/.built: $(PKG_BUILD_DIR)/.configured
        $(call Build/Compile)
        touch $$@

-    
+

   $(PKG_BUILD_DIR)/.dev-installed: $(PKG_BUILD_DIR)/.built
        $(call Build/InstallDev)
        touch $$@
   $(PKG_BUILD_DIR)/.dev-installed: $(PKG_BUILD_DIR)/.built
        $(call Build/InstallDev)
        touch $$@

-    
+

   package-clean: FORCE
        $(call Build/Clean)
        $(call Build/UninstallDev)
   package-clean: FORCE
        $(call Build/Clean)
        $(call Build/UninstallDev)


@@ -134,8 +134,7 @@ define BuildPackage
        echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
        ( \
                DEPENDS=; \
        echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
        ( \
                DEPENDS=; \

-               for depend in $$(IDEPEND_$(1)); do \
-                       [ "$$$${depend%%%%%%%%[A-Za-z]*}" = "@" ] && continue; \
+               for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \

                        DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
                done; \
                echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \
                        DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
                done; \
                echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \


@@ -154,8 +153,9 @@ define BuildPackage
   $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built
        $(call Package/$(1)/install,$$(IDIR_$(1)))
        mkdir -p $(PACKAGE_DIR)
   $$(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 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)
 
        $(RSTRIP) $$(IDIR_$(1))
        $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
 


@@ -263,7 +263,11 @@ else
   prepare: $(PKG_BUILD_DIR)/.prepared
   configure: $(PKG_BUILD_DIR)/.configured
 
   prepare: $(PKG_BUILD_DIR)/.prepared
   configure: $(PKG_BUILD_DIR)/.configured
 

+ifdef Build/InstallDev

   compile-targets: $(PKG_BUILD_DIR)/.dev-installed
   compile-targets: $(PKG_BUILD_DIR)/.dev-installed

+else
+  compile-targets:
+endif

   compile: compile-targets
 
   install-targets:
   compile: compile-targets
 
   install-targets: