projects
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6c26dac
)
move configure args to CONFIGURE_ARGS and configure variable to CONFIGURE_VARS to...
author
nbd
<nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 25 Feb 2007 23:10:32 +0000
(23:10 +0000)
committer
nbd
<nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 25 Feb 2007 23:10:32 +0000
(23:10 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6370
3c298f89
-4303-0410-b956-
a3cf2f4a3e73
include/package.mk
patch
|
blob
|
history
diff --git
a/include/package.mk
b/include/package.mk
index
8457516
..
0400d08
100644
(file)
--- a/
include/package.mk
+++ b/
include/package.mk
@@
-286,18
+286,7
@@
define Build/Prepare
$(call Build/Prepare/Default,)
endef
$(call Build/Prepare/Default,)
endef
-define Build/Configure/Default
- (cd $(PKG_BUILD_DIR)/$(strip $(3)); \
- if [ -x configure ]; then \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- CXXFLAGS="$(TARGET_CFLAGS)" \
- CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
- LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
- PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
- PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
- $(2) \
- $(PKG_CONFIGURE_PATH)/configure \
+CONFIGURE_ARGS := \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
@@
-313,7
+302,24
@@
define Build/Configure/Default
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
- $(DISABLE_NLS) \
+ $(DISABLE_NLS)
+
+CONFIGURE_VARS:= \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ CXXFLAGS="$(TARGET_CFLAGS)" \
+ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
+ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
+
+define Build/Configure/Default
+ (cd $(PKG_BUILD_DIR)/$(strip $(3)); \
+ if [ -x configure ]; then \
+ $(CONFIGURE_VARS) \
+ $(2) \
+ $(PKG_CONFIGURE_PATH)/configure \
+ $(CONFIGURE_ARGS) \
$(1); \
fi; \
)
$(1); \
fi; \
)