Преглед на файлове

more use of the INSTALL_DIR variable

SVN-Revision: 6023
Nicolas Thill преди 19 години
родител
ревизия
bed47be36c
променени са 4 файла, в които са добавени 6 реда и са изтрити 5 реда
  1. 1 1
      package/busybox/Makefile
  2. 2 2
      package/ifenslave/Makefile
  3. 2 1
      package/iptables/Makefile
  4. 1 1
      package/qos-scripts/Makefile

+ 1 - 1
package/busybox/Makefile

@@ -75,7 +75,7 @@ define Package/busybox/install
 		IPKG_ARCH="$(ARCH)" \
 		CONFIG_PREFIX="$(1)" \
 		install
-	mkdir -p $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/init.d
 	for tmp in $(init-y); do \
 		$(INSTALL_BIN) ./files/$$$$tmp $(1)/etc/init.d/$$$$tmp; \
 	done

+ 2 - 2
package/ifenslave/Makefile

@@ -35,8 +35,8 @@ define Build/Compile
 endef
 
 define Package/ifenslave/install
-	mkdir -p $(1)/sbin
-	$(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/sbin
+	$(INSTALL_DIR) $(1)/sbin
+	$(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/sbin/
 endef
 
 $(eval $(call BuildPackage,ifenslave))

+ 2 - 1
package/iptables/Makefile

@@ -241,7 +241,8 @@ define BuildPlugin
   $$(eval $$(call BuildPackage,$(1)))
 endef
 
-L7_INSTALL:=mkdir -p $$(1)/etc/l7-protocols; \
+L7_INSTALL:=\
+	$(INSTALL_DIR) $$(1)/etc/l7-protocols; \
 	$(CP) files/l7/*.pat $$(1)/etc/l7-protocols/
 
 $(eval $(call BuildPackage,iptables))

+ 1 - 1
package/qos-scripts/Makefile

@@ -37,7 +37,7 @@ define Build/Compile
 endef
 
 define Package/qos-scripts/install
-	mkdir -p $(1)
+	$(INSTALL_DIR) $(1)
 	$(CP) ./files/* $(1)/
 endef