X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fpackage-defaults.mk;h=487811c0e2567ececdddfaa8fa6470147ff84ec2;hb=f66cb6f810e55016167086bd96310fc14c1e6362;hp=e371c3bdff286d90aa1ce8a9bc6b95d68512aea4;hpb=eadf5fb7f8313d78fa503665e96457d080e6e3f9;p=openwrt%2Fstaging%2Fwigyori.git

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index e371c3bdff..487811c0e2 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -62,6 +62,7 @@ Build/Patch:=$(Build/Patch/Default)
 ifneq ($(strip $(PKG_UNPACK)),)
   define Build/Prepare/Default
 	$(PKG_UNPACK)
+	[ ! -d ./src/ ] || $(CP) ./src/* $(PKG_BUILD_DIR)
 	$(Build/Patch)
   endef
 endif
@@ -97,7 +98,7 @@ CONFIGURE_ARGS = \
 CONFIGURE_VARS = \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
-		CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \
 		CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \