Merge pull request #559 from wigyori/cc-misc2

[15.05/openwrt.git] / package / utils / ugps / Makefile

diff --git a/package/utils/ugps/Makefile b/package/utils/ugps/Makefile
index 44dbb59..1597d7a 100644 (file)
--- a/package/utils/ugps/Makefile
+++ b/package/utils/ugps/Makefile
@@ -8,16 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ugps
-PKG_VERSION:=2014-08-01
+PKG_VERSION:=2015-08-17
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=git://git.openwrt.org/project/ugps.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1c31c99edd9de9dcb403750b04041eccc751ac5e
+PKG_SOURCE_VERSION:=971e6703eb9bed936cc62cd335105bd2acca14ef
 
 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
+PKG_LICENSE:=GPL-2.0+
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -31,11 +32,19 @@ endef
 
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
 
+ifneq ($(CONFIG_USE_GLIBC),)
+  TARGET_CFLAGS += -D_DEFAULT_SOURCE
+endif
+
+define Package/ugps/conffiles
+/etc/config/gps
+endef
+
 define Package/ugps/install
        $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ugps $(1)/usr/sbin/
        $(INSTALL_BIN) ./files/ugps.init $(1)/etc/init.d/ugps
-       $(INSTALL_BIN) ./files/gps.config $(1)/etc/config/gps
+       $(INSTALL_CONF) ./files/gps.config $(1)/etc/config/gps
 endef
 
 $(eval $(call BuildPackage,ugps))