From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 3 Sep 2007 06:46:44 +0000 (+0000)
Subject: move ipkg related vars from ./rules.mk to ./include/package-ipkg.mk
X-Git-Tag: reboot~28238
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3f80599cdadeb61589776ac3b6caa85e2ddac7a0;p=oweals%2Fopenwrt.git

move ipkg related vars from ./rules.mk to ./include/package-ipkg.mk

SVN-Revision: 8581
---

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index cc9a780147..452ae5032d 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -5,6 +5,18 @@
 # See /LICENSE for more information.
 #
 
+# where to build (and put) .ipk packages
+IPKG:= \
+  IPKG_TMP=$(TMP_DIR)/ipkg \
+  IPKG_INSTROOT=$(TARGET_DIR) \
+  IPKG_CONF_DIR=$(STAGING_DIR)/etc \
+  IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
+  $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
+
+# invoke ipkg-build with some default options
+IPKG_BUILD:= \
+  ipkg-build -c -o 0 -g 0
+
 define BuildIPKGVariable
   $(call shexport,Package/$(1)/$(2))
   $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
diff --git a/rules.mk b/rules.mk
index aa781460ed..b817537826 100644
--- a/rules.mk
+++ b/rules.mk
@@ -107,18 +107,6 @@ RSTRIP:= \
   STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" \
   $(SCRIPT_DIR)/rstrip.sh
 
-# where to build (and put) .ipk packages
-IPKG:= \
-  IPKG_TMP=$(TMP_DIR)/ipkg \
-  IPKG_INSTROOT=$(TARGET_DIR) \
-  IPKG_CONF_DIR=$(STAGING_DIR)/etc \
-  IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
-  $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
-
-# invoke ipkg-build with some default options
-IPKG_BUILD:= \
-  ipkg-build -c -o 0 -g 0
-
 ifeq ($(CONFIG_ENABLE_LOCALE),true)
   DISABLE_NLS:=
 else