Просмотр исходного кода

pcre: small makefile fixes

- make license tag spdx conform
- drop duplicate copy commands (previous lines with asterisk match already)
- minor whitespace cleanup

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Michael Heimpold 10 лет назад
Родитель
Сommit
bd02c168cd
1 измененных файлов: 3 добавлений и 7 удалений
  1. 3
    7
      libs/pcre/Makefile

+ 3
- 7
libs/pcre/Makefile Просмотреть файл

@@ -1,5 +1,5 @@
1 1
 #
2
-# Copyright (C) 2006-2011 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,14 +9,14 @@ include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=pcre
11 11
 PKG_VERSION:=8.35
12
-PKG_RELEASE:=2
12
+PKG_RELEASE:=3
13 13
 
14 14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
15 15
 PKG_SOURCE_URL:=@SF/pcre
16 16
 PKG_MD5SUM:=6aacb23986adccd9b3bc626c00979958
17 17
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
18 18
 
19
-PKG_LICENSE:=BSD-3c
19
+PKG_LICENSE:=BSD-3-Clause
20 20
 PKG_LICENSE_FILES:=LICENCE
21 21
 
22 22
 PKG_FIXUP:=autoreconf
@@ -42,7 +42,6 @@ define Package/libpcrecpp
42 42
   DEPENDS:=+libpcre +libstdcpp
43 43
 endef
44 44
 
45
-
46 45
 TARGET_CFLAGS += $(FPIC)
47 46
 
48 47
 CONFIGURE_ARGS += \
@@ -70,17 +69,14 @@ define Build/InstallDev
70 69
 
71 70
 	$(INSTALL_DIR) $(1)/usr/lib
72 71
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre*.{a,so*} $(1)/usr/lib//
73
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre.so $(1)/usr/lib/
74 72
 
75 73
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
76 74
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpcre*.pc $(1)/usr/lib/pkgconfig/
77
-
78 75
 endef
79 76
 
80 77
 define Package/libpcre/install
81 78
 	$(INSTALL_DIR) $(1)/usr/lib
82 79
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so.* $(1)/usr/lib/
83
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre.so $(1)/usr/lib/
84 80
 endef
85 81
 
86 82
 define Package/libpcrecpp/install