projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ccache, samba36: fix samba.org addresses to use https
[openwrt/openwrt.git]
/
include
/
package-defaults.mk
diff --git
a/include/package-defaults.mk
b/include/package-defaults.mk
index 09efaa39b8b74526d30e096cb0269b80fa92bc80..487811c0e2567ececdddfaa8fa6470147ff84ec2 100644
(file)
--- a/
include/package-defaults.mk
+++ b/
include/package-defaults.mk
@@
-17,7
+17,6
@@
define Package/Default
CONFIGFILE:=
SECTION:=opt
CATEGORY:=Extra packages
CONFIGFILE:=
SECTION:=opt
CATEGORY:=Extra packages
- PACKAGE_SUBDIR:=$(FEED)
DEPENDS:=
MDEPENDS:=
CONFLICTS:=
DEPENDS:=
MDEPENDS:=
CONFLICTS:=
@@
-63,6
+62,7
@@
Build/Patch:=$(Build/Patch/Default)
ifneq ($(strip $(PKG_UNPACK)),)
define Build/Prepare/Default
$(PKG_UNPACK)
ifneq ($(strip $(PKG_UNPACK)),)
define Build/Prepare/Default
$(PKG_UNPACK)
+ [ ! -d ./src/ ] || $(CP) ./src/* $(PKG_BUILD_DIR)
$(Build/Patch)
endef
endif
$(Build/Patch)
endef
endif
@@
-98,7
+98,7
@@
CONFIGURE_ARGS = \
CONFIGURE_VARS = \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CONFIGURE_VARS = \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
- CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CFLAGS)" \
+ CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_C
XX
FLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
@@
-137,7
+137,7
@@
MAKE_INSTALL_FLAGS = \
$(MAKE_FLAGS) \
DESTDIR="$(PKG_INSTALL_DIR)"
$(MAKE_FLAGS) \
DESTDIR="$(PKG_INSTALL_DIR)"
-MAKE_PATH = .
+MAKE_PATH
?
= .
define Build/Compile/Default
+$(MAKE_VARS) \
define Build/Compile/Default
+$(MAKE_VARS) \