summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-01-24 12:27:35 +0100
committertnut <thierryn1 at hispeed dot ch>2010-01-24 12:27:35 +0100
commit554844abc757892d4af8b2de8ec8f0ef56efdbf2 (patch)
tree07fbc9fa0f3486303a5e628725c60cee943d663b
parentff0d34015252d5b0f1dd9849b3ad463045bf298d (diff)
parent020166e554de36bd99ffcbc2bcb11a9cc9a03fb6 (diff)
downloadnutyx-extra-554844abc757892d4af8b2de8ec8f0ef56efdbf2.tar.gz
nutyx-extra-554844abc757892d4af8b2de8ec8f0ef56efdbf2.tar.bz2
nutyx-extra-554844abc757892d4af8b2de8ec8f0ef56efdbf2.tar.xz
nutyx-extra-554844abc757892d4af8b2de8ec8f0ef56efdbf2.zip
Merge commit 'guy/master'
-rw-r--r--extra/pptp/.footprint11
-rw-r--r--extra/pptp/Pkgfile2
2 files changed, 7 insertions, 6 deletions
diff --git a/extra/pptp/.footprint b/extra/pptp/.footprint
index 345a65057..7fbc3de9e 100644
--- a/extra/pptp/.footprint
+++ b/extra/pptp/.footprint
@@ -4,8 +4,9 @@ drwxr-xr-x root/root etc/ppp/
drwxr-xr-x root/root sbin/
-r-xr-xr-x root/root sbin/pptp
-r-xr-xr-x root/root sbin/pptpsetup
-drwxr-xr-x root/root share/
-drwxr-xr-x root/root share/man/
-drwxr-xr-x root/root share/man/man8/
--rw-r--r-- root/root share/man/man8/pptp.8.gz
--rw-r--r-- root/root share/man/man8/pptpsetup.8.gz
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/man/
+drwxr-xr-x root/root usr/share/man/man8/
+-rw-r--r-- root/root usr/share/man/man8/pptp.8.gz
+-rw-r--r-- root/root usr/share/man/man8/pptpsetup.8.gz
diff --git a/extra/pptp/Pkgfile b/extra/pptp/Pkgfile
index 5c77f3041..5a98065f5 100644
--- a/extra/pptp/Pkgfile
+++ b/extra/pptp/Pkgfile
@@ -11,7 +11,7 @@ source=(http://downloads.sourceforge.net/sourceforge/pptpclient/$name-$version.t
build() {
cd $name-$version
- sed -i 's|/usr||' Makefile
+ sed -i 's|BINDIR=$(DESTDIR)/usr|BINDIR=$(DESTDIR)|' Makefile
sed -i 's|/bin/ip|/sbin/ip|g' routing.c
make
make DESTDIR=$PKG install