From: Steven Barth <steven@midlink.org>
Date: Sun, 7 Jun 2009 13:25:25 +0000 (+0000)
Subject: Moar Makefile fixes
X-Git-Tag: 0.9.0~241
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d0a25be29e1a2db4e1364d4808aba19626134ed2;p=oweals%2Fluci.git

Moar Makefile fixes
---

diff --git a/contrib/package/cyassl-luci/Makefile b/contrib/package/cyassl-luci/Makefile
index ab78909c0..d782f8e21 100644
--- a/contrib/package/cyassl-luci/Makefile
+++ b/contrib/package/cyassl-luci/Makefile
@@ -43,7 +43,9 @@ CONFIGURE_ARGS += --without-zlib --enable-fastmath
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/ctaocrypt
+	$(INSTALL_DIR) $(1)/usr/include/cyassl
 	$(CP) $(PKG_BUILD_DIR)/ctaocrypt/include/*.h $(1)/usr/include/ctaocrypt
+	$(CP) -R $(PKG_BUILD_DIR)/include/* $(1)/usr/include/cyassl/
 	
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/src/.libs/libcyassl.{a,so*} $(1)/usr/lib/
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 7303c0302..35a47479d 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -27,6 +27,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 LUA_TARGET:=source
+LUCI_CFLAGS:=
 PKG_SELECTED_MODULES:=
 
 
@@ -281,6 +282,7 @@ endif
 
 ifneq ($(CONFIG_PACKAGE_luci-nixio_cyassl),)
   NIXIO_TLS:=cyassl
+  LUCI_CFLAGS+=-I$(STAGING_DIR)/usr/include/cyassl
 endif
 
 
@@ -1077,7 +1079,7 @@ MAKE_FLAGS += \
 	MODULES="$(PKG_SELECTED_MODULES)" \
 	LUA_TARGET="$(LUA_TARGET)" \
 	LUA_SHLIBS="-llua -lm -ldl -lcrypt" \
-	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+	CFLAGS="$(TARGET_CFLAGS) $(LUCI_CFLAGS) -I$(STAGING_DIR)/usr/include" \
 	LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \
 	NIXIO_TLS="$(NIXIO_TLS)" OS="Linux"