From bed47be36c3b1c2faa3c3eb8c878c5f19b42aa73 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Mon, 8 Jan 2007 00:53:24 +0000 Subject: more use of the INSTALL_DIR variable SVN-Revision: 6023 --- package/busybox/Makefile | 2 +- package/ifenslave/Makefile | 4 ++-- package/iptables/Makefile | 3 ++- package/qos-scripts/Makefile | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) (limited to 'package') diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 2927d70436..1ad4074002 100644 --- a/package/busybox/Makefile +++ b/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 diff --git a/package/ifenslave/Makefile b/package/ifenslave/Makefile index d4d33440df..f20498a30b 100644 --- a/package/ifenslave/Makefile +++ b/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)) diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 300ea7fdd0..6e486df925 100644 --- a/package/iptables/Makefile +++ b/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)) diff --git a/package/qos-scripts/Makefile b/package/qos-scripts/Makefile index bb5a9639f1..8124bc7558 100644 --- a/package/qos-scripts/Makefile +++ b/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 -- cgit v1.2.3