Set up ipv6 address if provided in network configuration (#1028)

[openwrt.git] / package / alsa / Makefile

diff --git a/package/alsa/Makefile b/package/alsa/Makefile
index d82d87a..7bd1550 100644 (file)
--- a/package/alsa/Makefile
+++ b/package/alsa/Makefile
@@ -33,14 +33,18 @@ endef
 
 ifeq ($(KERNEL),2.4)
   ifeq ($(LINUX_KARCH),i386)
-    KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-i386/mach-generic -I$(LINUX_DIR)/include/asm-i386/mach-default
     KERNEL_C_OPTS:= -Os -mpreferred-stack-boundary=2 -march=i486 -fno-unit-at-a-time
   endif
   ifeq ($(LINUX_KARCH),mips)
-    KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-mips/mach-generic
     KERNEL_C_OPTS:= -Os -G 0 -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap
   endif
 endif
+ifeq ($(LINUX_KARCH),i386)
+  KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-i386/mach-generic -I$(LINUX_DIR)/include/asm-i386/mach-default
+endif
+ifeq ($(LINUX_KARCH),mips)
+  KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-mips/mach-generic
+endif
 
 define Build/Configure
        (cd $(PKG_BUILD_DIR); \
@@ -63,15 +67,16 @@ define Build/Compile
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                c_opts="$(KERNEL_C_OPTS)" \
+               CP="$(CP)" \
                all
 endef
 
 define Package/kmod-alsa/install
-       install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION)
-       install -m0644 $(PKG_BUILD_DIR)/modules/*.$(LINUX_KMOD_SUFFIX) \
+       $(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/modules/*.$(LINUX_KMOD_SUFFIX) \
                $(1)/lib/modules/$(LINUX_VERSION)/
-       install -d -m0755 $(1)/etc/modules.d
-       install -m0644 ./files/alsa.modules $(1)/etc/modules.d/70-alsa
+       $(INSTALL_DIR) $(1)/etc/modules.d
+       $(INSTALL_DATA) ./files/alsa.modules $(1)/etc/modules.d/70-alsa
 endef
 
 $(eval $(call BuildPackage,kmod-alsa))