imagebuilder: clean package_list

[openwrt/openwrt.git] / include / package-defaults.mk

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index e371c3bdff286d90aa1ce8a9bc6b95d68512aea4..0eecd6c4f81ec121452c69833f8051f21387c75e 100644 (file)
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -56,12 +56,14 @@ define Package/Default
   VARIANT:=
   DEFAULT_VARIANT:=
   USERID:=
+  ALTERNATIVES:=
 endef
 
 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
@@ -91,13 +93,12 @@ CONFIGURE_ARGS = \
                --mandir=$(CONFIGURE_PREFIX)/man \
                --infodir=$(CONFIGURE_PREFIX)/info \
                $(DISABLE_NLS) \
-               $(DISABLE_LARGEFILE) \
                $(DISABLE_IPV6)
 
 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)" \