diff options
| author | Steven Barth <steven@midlink.org> | 2009-06-07 13:25:25 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2009-06-07 13:25:25 +0000 |
| commit | d0a25be29e1a2db4e1364d4808aba19626134ed2 (patch) | |
| tree | 77e3d92509b8b20d07767faa644f1cb08d591995 | |
| parent | 8adf9fbd4dc6129a55f8b0b38fc93b7a3213230c (diff) | |
Moar Makefile fixes
| -rw-r--r-- | contrib/package/cyassl-luci/Makefile | 2 | ||||
| -rw-r--r-- | contrib/package/luci/Makefile | 4 |
2 files changed, 5 insertions, 1 deletions
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" |