X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=multimedia%2Fpeercast%2FMakefile;h=4cba497be0d377be0f18cbd96422cc780bce528e;hb=028cf708548a15abe2c1f6501f6fc503f7c2bc31;hp=676fd86645e98b63bf466f9c4df06278cad5b6e0;hpb=1f75d5501cb34f16404df265874bb341e0daba2e;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/multimedia/peercast/Makefile b/multimedia/peercast/Makefile
index 676fd86645..4cba497be0 100644
--- a/multimedia/peercast/Makefile
+++ b/multimedia/peercast/Makefile
@@ -4,21 +4,16 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=peercast
 PKG_VERSION:=0.1214
 PKG_RELEASE:=1
-PKG_MD5SUM:=4e8449cde7135ad97f788e67e1bd64ee
 
-PKG_SOURCE_URL:=http://www.cti.ecp.fr/~beauxir5/peercast
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_SOURCE_URL:=http://www.cti.ecp.fr/~beauxir5/peercast
+PKG_MD5SUM:=4e8449cde7135ad97f788e67e1bd64ee
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,10 +22,6 @@ define Package/peercast
   CATEGORY:=Multimedia
   DEPENDS:=+libpthread +uclibcxx
   TITLE:=P2P audio and video streaming server
-  DESCRIPTION:=PeerCast is a fresh new P2P streaming server. It can stream music\\\
-	and video from a broad variety of formats. Many audio players can\\\
-	listen to peercast streams, as it's been built to remain compatible\\\
-	with Nullsoft Shoutcast.\\\
   URL:=http://www.peercast.org/
 endef
 
@@ -38,33 +29,36 @@ define Package/peercast/conffiles
 /etc/peercast.ini
 endef
 
-define Build/Configure
-$(call Build/Configure/Default,--enable-shared \
-			--disable-static \
-			--with-gnu-ld \
-			--enable-staticbin, \
-		$(TARGET_CONFIGURE_OPTS) \
-		BUILD_CC="$(TARGET_CC)" HOSTCC="$(HOSTCC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++ -nodefaultlibs" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		LIBS="-nodefaultlibs -luClibc++ -lpthread")
+define Package/peercast/description
+ PeerCast is a fresh new P2P streaming server. It can stream music and 
+ video from a broad variety of formats. Many audio players can listen to 
+ peercast streams, as it's been built to remain compatible with Nullsoft 
+ Shoutcast.
 endef
 
+CONFIGURE_ARGS += \
+	--enable-staticbin \
+
+CONFIGURE_VARS += \
+	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
+	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
+	LIBS="-nodefaultlibs -luClibc++ -lpthread" \
+
 define Build/Compile
-  $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" all install)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
 endef
 
 define Package/peercast/install	
-	install -m0755 -d $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/peercast $(1)/usr/sbin/
-	install -m0755 -d $(1)/usr/share/peercast/html
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/peercast $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/share/peercast/html
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/peercast/html/en $(1)/usr/share/peercast/html/
-	install -m0755 -d $(1)/etc
-	install -m0644 ./files/peercast.ini $(1)/etc/
-	install -m0755 -d $(1)/etc/init.d
-	install -m0755 ./files/peercast.init $(1)/etc/init.d/peercast
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) ./files/peercast.ini $(1)/etc/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/peercast.init $(1)/etc/init.d/peercast
 endef
 
 $(eval $(call BuildPackage,peercast))