X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fprosody%2FMakefile;h=a6ed1eb6a6c8a94e677a3a7106fc8b76ad2d46ee;hp=d634394df66b9b8c7081fcc89701ce394f012db7;hb=53d0b02d0292951d0b91296f344d83160015c6dc;hpb=4188faa1cecf06a97dd2d26eb5a367f62cb26cd9

diff --git a/net/prosody/Makefile b/net/prosody/Makefile
index d634394df6..a6ed1eb6a6 100644
--- a/net/prosody/Makefile
+++ b/net/prosody/Makefile
@@ -4,24 +4,23 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=prosody
-PKG_VERSION:=0.3.0
-PKG_RELEASE:=1
+PKG_VERSION:=0.4.0
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://prosody.im/downloads/source/
-PKG_MD5SUM:=97b19d75b3d6770fb9b46b6452f945dd
+PKG_MD5SUM:=c143532a289a72d5d48b81b5bdac7c25
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/prosody
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+liblua +libidn +luasocket +luaexpat +luasec
+  DEPENDS:=+liblua +libidn +libopenssl +luasocket +luaexpat +luasec
   TITLE:=XMPP server
   URL:=http://prosody.im
 endef
@@ -37,10 +36,11 @@ define Package/prosody/conffiles
 endef
 
 define Build/Configure
+	# this is *NOT* GNU autoconf stuff
 	(cd $(PKG_BUILD_DIR); ./configure \
 		--prefix=/usr \
 		--with-lua="$(STAGING_DIR)/host/bin" \
-		--with-lua-include="$(STAGING_DIR)/usr/include/" \
+		--with-lua-include="$(STAGING_DIR)/usr/include" \
 		--with-lua-lib="$(STAGING_DIR)/usr/lib" \
 		--cflags="$(TARGET_CFLAGS)" \
 	)
@@ -48,8 +48,8 @@ endef
 
 define Build/Compile
 	$(call Build/Compile/Default,\
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		PREFIX="/usr" \
 		all install \
@@ -57,7 +57,7 @@ define Build/Compile
 endef
 
 define Package/prosody/install
-	$(INSTALL_DIR) $(1)/
+	$(INSTALL_DIR) $(1)
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef