summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-12-14 00:16:01 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-12-14 00:16:01 +0000
commit293e3b3d44b062a95d9e7fe2362bb89389d0c0b4 (patch)
tree72d8a38d44be41c0fb27eee6863edbffb452f2a5
parent9f4c468cae6cab3b0284d78b6d8fb0b76d989e20 (diff)
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
-rw-r--r--[-rwxr-xr-x]package/vpnc/Makefile11
-rw-r--r--package/vpnc/ipkg/vpnc.conffiles2
2 files changed, 11 insertions, 2 deletions
diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile
index 6aec933e71..7513290eba 100755..100644
--- 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 0000000000..8185af9cbb
--- /dev/null
+++ b/package/vpnc/ipkg/vpnc.conffiles
@@ -0,0 +1,2 @@
+/etc/vpnc/vpnc.conf
+/etc/vpnc/vpnc-script