From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 14 Dec 2005 00:16:01 +0000 (+0000)
Subject: install in /usr instead of /usr/local/,
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=293e3b3d44b062a95d9e7fe2362bb89389d0c0b4;p=openwrt-10.03%2F.git

install in /usr instead of /usr/local/,
add an ipkg/conffiles, add an Id tag to the Makefile


git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2666 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile
old mode 100755
new mode 100644
index 6aec933e7..7513290eb
--- a/package/vpnc/Makefile
+++ b/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/package/vpnc/ipkg/vpnc.conffiles b/package/vpnc/ipkg/vpnc.conffiles
new file mode 100644
index 000000000..8185af9cb
--- /dev/null
+++ b/package/vpnc/ipkg/vpnc.conffiles
@@ -0,0 +1,2 @@
+/etc/vpnc/vpnc.conf
+/etc/vpnc/vpnc-script