Parcourir la source

busybox: fix spurious rebuild issue

SVN-Revision: 14975
Felix Fietkau il y a 17 ans
Parent
commit
fce316bc0b
1 fichiers modifiés avec 6 ajouts et 4 suppressions
  1. 6 4
      package/busybox/Makefile

+ 6 - 4
package/busybox/Makefile

@@ -68,9 +68,7 @@ define Build/Compile
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
 		ARCH="$(ARCH)" \
 		all
-endef
-
-define Package/busybox/install
+	rm -rf $(PKG_INSTALL_DIR)
 	$(FIND) $(PKG_BUILD_DIR) -lname "*busybox" -exec rm \{\} \;
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
@@ -78,9 +76,13 @@ define Package/busybox/install
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
 		ARCH="$(ARCH)" \
 		IPKG_ARCH="$(ARCH)" \
-		CONFIG_PREFIX="$(1)" \
+		CONFIG_PREFIX="$(PKG_INSTALL_DIR)" \
 		install
+endef
+
+define Package/busybox/install
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 	for tmp in $(init-y); do \
 		$(INSTALL_BIN) ./files/$$$$tmp $(1)/etc/init.d/$$$$tmp; \
 	done