Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Moar Makefile fixes

Browse source
This commit is contained in:
Steven Barth 2009-06-07 13:25:25 +00:00
parent 8adf9fbd4d
commit d0a25be29e
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/package/cyassl-luci/Makefile
View file

@ -43,7 +43,9 @@ CONFIGURE_ARGS += --without-zlib --enable-fastmath
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/ctaocrypt $(INSTALL_DIR) $(1)/usr/include/ctaocrypt
$(INSTALL_DIR) $(1)/usr/include/cyassl
$(CP) $(PKG_BUILD_DIR)/ctaocrypt/include/*.h $(1)/usr/include/ctaocrypt $(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 $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/src/.libs/libcyassl.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/src/.libs/libcyassl.{a,so*} $(1)/usr/lib/

4
contrib/package/luci/Makefile
View file

@ -27,6 +27,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
LUA_TARGET:=source LUA_TARGET:=source
LUCI_CFLAGS:=
PKG_SELECTED_MODULES:= PKG_SELECTED_MODULES:=
@ -281,6 +282,7 @@ endif
ifneq ($(CONFIG_PACKAGE_luci-nixio_cyassl),) ifneq ($(CONFIG_PACKAGE_luci-nixio_cyassl),)
NIXIO_TLS:=cyassl NIXIO_TLS:=cyassl
LUCI_CFLAGS+=-I$(STAGING_DIR)/usr/include/cyassl
endif endif
@ -1077,7 +1079,7 @@ MAKE_FLAGS += \
MODULES="$(PKG_SELECTED_MODULES)" \ MODULES="$(PKG_SELECTED_MODULES)" \
LUA_TARGET="$(LUA_TARGET)" \ LUA_TARGET="$(LUA_TARGET)" \
LUA_SHLIBS="-llua -lm -ldl -lcrypt" \ 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" \ LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \
NIXIO_TLS="$(NIXIO_TLS)" OS="Linux" NIXIO_TLS="$(NIXIO_TLS)" OS="Linux"