From 3f774a5f9d4c5b3c98f93866a56fac0b80189a0f Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 14 Dec 2005 00:16:01 +0000
Subject: [PATCH] install in /usr instead of /usr/local/, add an
 ipkg/conffiles, add an Id tag to the Makefile

SVN-Revision: 2666
---
 openwrt/package/vpnc/Makefile            | 11 +++++++++--
 openwrt/package/vpnc/ipkg/vpnc.conffiles |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 openwrt/package/vpnc/Makefile
 create mode 100644 openwrt/package/vpnc/ipkg/vpnc.conffiles

diff --git a/openwrt/package/vpnc/Makefile b/openwrt/package/vpnc/Makefile
old mode 100755
new mode 100644
index 6aec933e71..7513290eba
--- a/openwrt/package/vpnc/Makefile
+++ b/openwrt/package/vpnc/Makefile
@@ -1,3 +1,5 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vpnc
@@ -21,11 +23,16 @@ $(PKG_BUILD_DIR)/.configured:
 	touch $@
 
 $(PKG_BUILD_DIR)/.built:
-	$(MAKE) STAGING_DIR=$(STAGING_DIR) CC=$(TARGET_CC) DESTDIR=$(PKG_INSTALL_DIR) -C $(PKG_BUILD_DIR) all install
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC=$(TARGET_CC) \
+		STAGING_DIR=$(STAGING_DIR) \
+		DESTDIR=$(PKG_INSTALL_DIR) \
+		PREFIX=/usr \
+		all install
 	touch $@
 
 $(IPKG_VPNC):
-	mkdir -p $(IDIR_VPNC)
+	install -d -m0755 $(IDIR_VPNC)
 	cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_VPNC)/
 	$(RSTRIP) $(IDIR_VPNC)
 	$(IPKG_BUILD) $(IDIR_VPNC) $(PACKAGE_DIR)
diff --git a/openwrt/package/vpnc/ipkg/vpnc.conffiles b/openwrt/package/vpnc/ipkg/vpnc.conffiles
new file mode 100644
index 0000000000..8185af9cbb
--- /dev/null
+++ b/openwrt/package/vpnc/ipkg/vpnc.conffiles
@@ -0,0 +1,2 @@
+/etc/vpnc/vpnc.conf
+/etc/vpnc/vpnc-script
-- 
2.30.2