From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 4 Feb 2012 20:19:14 +0000 (+0000)
Subject: [packages_10.03.2] p910nd: merge r29227
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=8da0af8a1e3eec7e58ed291544257f1eab5c61bd;p=10.03%2Fpackages.git

[packages_10.03.2] p910nd: merge r29227

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30114 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/p910nd/Makefile b/net/p910nd/Makefile
index 1e0fafb..7b0b957 100644
--- a/net/p910nd/Makefile
+++ b/net/p910nd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=p910nd
 PKG_VERSION:=0.95
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/p910nd
@@ -45,11 +45,11 @@ MAKE_FLAGS += \
 
 define Package/p910nd/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/$(PKG_NAME) $(1)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/p910nd $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/$(PKG_NAME).conf $(1)/etc/config/$(PKG_NAME)
+	$(INSTALL_DATA) ./files/p910nd.config $(1)/etc/config/p910nd
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
+	$(INSTALL_BIN) ./files/p910nd.init $(1)/etc/init.d/p910nd
 endef
 
 $(eval $(call BuildPackage,p910nd))
diff --git a/net/p910nd/files/p910nd.conf b/net/p910nd/files/p910nd.conf
deleted file mode 100644
index 57a3058..0000000
--- a/net/p910nd/files/p910nd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-config p910nd
-	option device        /dev/lp0
-	option port          0
-	option bidirectional 1
-	option enabled       0
diff --git a/net/p910nd/files/p910nd.config b/net/p910nd/files/p910nd.config
new file mode 100644
index 0000000..57a3058
--- /dev/null
+++ b/net/p910nd/files/p910nd.config
@@ -0,0 +1,5 @@
+config p910nd
+	option device        /dev/lp0
+	option port          0
+	option bidirectional 1
+	option enabled       0