projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[x86] fix grub installation on target images, regression caused by multi-libc support
[openwrt.git]
/
include
/
package-defaults.mk
diff --git
a/include/package-defaults.mk
b/include/package-defaults.mk
index
fd50cb4
..
99371a2
100644
(file)
--- a/
include/package-defaults.mk
+++ b/
include/package-defaults.mk
@@
-76,7
+76,7
@@
CONFIGURE_VARS = \
CONFIGURE_PATH = .
CONFIGURE_CMD = ./configure
CONFIGURE_PATH = .
CONFIGURE_CMD = ./configure
-replace_script=$(FIND) $(1) -name $(2) | $(XARGS) -n1 cp $(SCRIPT_DIR)/$(2);
+replace_script=$(FIND) $(1) -name $(2) | $(XARGS)
chmod u+w; $(FIND) $(1) -name $(2) | $(XARGS)
-n1 cp $(SCRIPT_DIR)/$(2);
define Build/Configure/Default
(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \
define Build/Configure/Default
(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \
@@
-102,6
+102,10
@@
MAKE_FLAGS = \
CROSS="$(TARGET_CROSS)" \
ARCH="$(ARCH)"
CROSS="$(TARGET_CROSS)" \
ARCH="$(ARCH)"
+MAKE_INSTALL_FLAGS = \
+ $(MAKE_FLAGS) \
+ DESTDIR="$(PKG_INSTALL_DIR)"
+
MAKE_PATH = .
define Build/Compile/Default
MAKE_PATH = .
define Build/Compile/Default
@@
-110,3
+114,10
@@
define Build/Compile/Default
$(MAKE_FLAGS) \
$(1);
endef
$(MAKE_FLAGS) \
$(1);
endef
+
+define Build/Install/Default
+ $(MAKE_VARS) \
+ $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
+ $(MAKE_INSTALL_FLAGS) \
+ $(1) install;
+endef
This page took
0.025879 seconds
and
4
git commands to generate.