Переглянути джерело

expat: small makefile fixes

- fix licensing file list
- install pkgconfig file
- drop explicite call to Build/Compile
- use PKG_INSTALL

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Michael Heimpold 10 роки тому
джерело
коміт
3f4b17b150
1 змінених файлів з 9 додано та 9 видалено
  1. 9
    9
      libs/expat/Makefile

+ 9
- 9
libs/expat/Makefile Переглянути файл

@@ -1,5 +1,5 @@
1 1
 #
2
-# Copyright (C) 2006 OpenWrt.org
2
+# Copyright (C) 2006-2014 OpenWrt.org
3 3
 #
4 4
 # This is free software, licensed under the GNU General Public License v2.
5 5
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=expat
11 11
 PKG_VERSION:=2.1.0
12
-PKG_RELEASE:=1
12
+PKG_RELEASE:=2
13 13
 
14 14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
15 15
 PKG_MD5SUM:=dd7dab7a5fea97d2a6a43f511449b7cd
@@ -17,11 +17,12 @@ PKG_SOURCE_URL:=@SF/expat
17 17
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
18 18
 
19 19
 PKG_LICENSE:=MIT
20
-PACKAGE_LICENSE_FILES:=COPYING
20
+PKG_LICENSE_FILES:=COPYING
21 21
 
22 22
 PKG_FIXUP:=autoreconf
23 23
 PKG_REMOVE_FILES:=conftools/libtool.m4
24 24
 
25
+PKG_INSTALL:=1
25 26
 PKG_BUILD_PARALLEL:=1
26 27
 
27 28
 include $(INCLUDE_DIR)/host-build.mk
@@ -38,17 +39,12 @@ define Package/libexpat/description
38 39
  A fast, non-validating, stream-oriented XML parsing library.
39 40
 endef
40 41
 
41
-
42 42
 TARGET_CFLAGS += $(FPIC)
43 43
 
44 44
 CONFIGURE_ARGS += \
45 45
 	--enable-shared \
46 46
 	--enable-static
47 47
 
48
-define Build/Compile
49
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
50
-endef
51
-
52 48
 define Host/Install
53 49
 	$(MAKE) -C $(HOST_BUILD_DIR) install
54 50
 endef
@@ -56,13 +52,17 @@ endef
56 52
 define Build/InstallDev
57 53
 	$(INSTALL_DIR) $(1)/usr/include
58 54
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/expat{,_external}.h $(1)/usr/include/
55
+
56
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
57
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/expat.pc $(1)/usr/lib/pkgconfig/
58
+
59 59
 	$(INSTALL_DIR) $(1)/usr/lib
60 60
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.{a,so*} $(1)/usr/lib/
61 61
 endef
62 62
 
63 63
 define Package/libexpat/install
64 64
 	$(INSTALL_DIR) $(1)/usr/lib
65
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(1)/usr/lib/
65
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so* $(1)/usr/lib/
66 66
 endef
67 67
 
68 68
 $(eval $(call HostBuild))