From: Michael Heimpold <mhei@heimpold.de>
Date: Wed, 3 Sep 2014 21:28:48 +0000 (+0200)
Subject: pcre: small makefile fixes
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=bd02c168cdbe5ae6c9b65c19e2537326af04fb8d;p=feed%2Fpackages.git

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>
---

diff --git a/libs/pcre/Makefile b/libs/pcre/Makefile
index f5f5df0654..e93475e1ed 100644
--- a/libs/pcre/Makefile
+++ b/libs/pcre/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pcre
 PKG_VERSION:=8.35
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/pcre
 PKG_MD5SUM:=6aacb23986adccd9b3bc626c00979958
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
 
-PKG_LICENSE:=BSD-3c
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENCE
 
 PKG_FIXUP:=autoreconf
@@ -42,7 +42,6 @@ define Package/libpcrecpp
   DEPENDS:=+libpcre +libstdcpp
 endef
 
-
 TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \
@@ -70,17 +69,14 @@ define Build/InstallDev
 
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre*.{a,so*} $(1)/usr/lib//
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre.so $(1)/usr/lib/
 
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpcre*.pc $(1)/usr/lib/pkgconfig/
-
 endef
 
 define Package/libpcre/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so.* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre.so $(1)/usr/lib/
 endef
 
 define Package/libpcrecpp/install