Make sure lua will get built

[openwrt/svn-archive/archive.git] / net / weechat / Makefile

diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index 29b8e44fdfc5a364f2c0f2e9fdcb3eae73d8c00b..67ef94ddce855d0295926416718266dbb6c3556d 100644 (file)
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -9,20 +9,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=weechat
-PKG_VERSION:=0.2.5
-PKG_RELEASE:=2
+PKG_VERSION:=0.2.6
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://weechat.flashtux.org/download/
-PKG_MD5SUM:=42f96620c3b2fd3dca9768d9ce16dd06
+PKG_MD5SUM:=ccdecf663b0050a23049acb4b9a76193
+
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/weechat/Default
- SECTION:=net
- CATEGORY:=Network
- TITLE:=Lightweight IRC client
- URL:=http://weechat.flashtux.org/
+  SUBMENU:=Instant Messaging
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Lightweight IRC client
+  URL:=http://weechat.flashtux.org/
 endef
 
 define Package/weechat/Default/description
@@ -75,15 +78,20 @@ CONFIGURE_ARGS+= \
        --disable-perl \
        --disable-python \
        --disable-ruby \
+       LUACONFIG="" \
 
 CONFIGURE_VARS+= \
        LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
 
-ifndef ($(SDK)$(CONFIG_PACKAGE_weechat-mod-lua),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_weechat-mod-lua),)
   CONFIGURE_ARGS+= \
        --enable-lua \
+       --enable-plugins \
+       --with-plugins="lua" \
        --with-lua-inc="$(STAGING_DIR)/usr/include" \
-       --with-lua-lib="$(STAGING_DIR)/usr/lib"
+       --with-lua-lib="$(STAGING_DIR)/usr/lib" \
+       LUA_CFLAGS="-I$(STAGING_DIR)/usr/include/"
+       LUA_LFLAGS="-L$(STAGING_DIR)/usr/lib -llualib50 -llua50"
   CONFIGURE_VARS+= \
        LIBS="-ldl -lm"
 else
@@ -91,21 +99,17 @@ else
        --disable-lua
 endif
 
-
-define Build/Configure
-       $(call Build/Configure/Default)
-       $(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) all
-       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(LUA_FLAGS) \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               LUACONFIG="" \
+               all install
 endef
 
 define Package/weechat/install 
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/weechat-curses $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/weechat-curses $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/usr/lib/weechat/plugins
 endef