X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Flibdvbpsi4%2FMakefile;h=b2cd823f4fb368ef498bf8980b11d716c30b088c;hp=95fc4519426431eacf494fec64397ef2c59cd280;hb=f51d463f54fd8d8c05a792efe824686c29f07142;hpb=d4a7002bc9ee8b2e83a431bc95f90811bd43af01;ds=sidebyside

diff --git a/libs/libdvbpsi4/Makefile b/libs/libdvbpsi4/Makefile
index 95fc451942..b2cd823f4f 100644
--- a/libs/libdvbpsi4/Makefile
+++ b/libs/libdvbpsi4/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -15,9 +15,12 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.videolan.org/pub/libdvbpsi/$(PKG_VERSION)/
 PKG_MD5SUM:=407cd074b7d6eaf31b20b693ed924655
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL=1
+
 define Package/libdvbpsi4
   SECTION:=libs
   CATEGORY:=Libraries
@@ -26,29 +29,28 @@ define Package/libdvbpsi4
 endef
 
 define Package/libdvbpsi4/description
-	libdvbpsi is a simple library designed for MPEG TS and DVB PSI tables 
+	libdvbpsi is a simple library designed for MPEG TS and DVB PSI tables
 	decoding and generating.
 endef
 
 TARGET_CFLAGS += $(FPIC)
 
-define Build/Compile
-	$(call Build/Compile/Default, \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install \
-	)
-endef
-
 define Build/InstallDev
-	mkdir -p $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/dvbpsi $(1)/usr/include/
-	mkdir -p $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.{a,so*,la} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/include/dvbpsi
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/include/dvbpsi/*.h \
+		$(1)/usr/include/dvbpsi/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.{so*,la} \
+		$(1)/usr/lib/
 endef
 
 define Package/libdvbpsi4/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.so* $(1)/usr/lib/
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.so* \
+		$(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libdvbpsi4))