projects / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| a373e543 SS |
1 | From 343728d5de6e44bd67923503e62eefaad50760a4 Mon Sep 17 00:00:00 2001 |
| 2 | From: Michal Sekletar <msekleta@redhat.com> | |
| 3 | Date: Fri, 4 Apr 2014 18:47:01 +0200 | |
| 4 | Subject: [PATCH 08/25] build-sys: use prefix /usr instead of /usr/local | |
| 5 | ||
| 6 | --- | |
| 7 | configure | 2 +- | |
| 8 | pppd/Makefile.linux | 4 ++-- | |
| 9 | scripts/ppp-on-rsh | 2 +- | |
| 10 | scripts/ppp-on-ssh | 4 ++-- | |
| 11 | scripts/secure-card | 2 +- | |
| 12 | 5 files changed, 7 insertions(+), 7 deletions(-) | |
| 13 | ||
| 14 | diff --git a/configure b/configure | |
| 15 | index 6a55e0f..db54d77 100755 | |
| 16 | --- a/configure | |
| 17 | +++ b/configure | |
| fa4c11b5 | 18 | @@ -2,7 +2,7 @@ |
| a373e543 | 19 | # $Id: configure,v 1.38 2008/06/15 07:08:49 paulus Exp $ |
| fa4c11b5 MT |
20 | |
| 21 | # Where to install stuff by default | |
| 22 | -DESTDIR=/usr/local | |
| 23 | +DESTDIR=/usr | |
| 24 | SYSCONF=/etc | |
| 25 | ||
| 26 | # if [ -d /NextApps ]; then | |
| a373e543 SS |
27 | diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux |
| 28 | index 4f27100..95c2598 100644 | |
| 29 | --- a/pppd/Makefile.linux | |
| 30 | +++ b/pppd/Makefile.linux | |
| 31 | @@ -99,8 +99,8 @@ endif | |
| fa4c11b5 MT |
32 | |
| 33 | # EAP SRP-SHA1 | |
| 34 | ifdef USE_SRP | |
| 35 | -CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include | |
| 36 | -LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto | |
| 37 | +CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/include/openssl | |
| 38 | +LIBS += -lsrp -L/usr/lib -lcrypto | |
| 39 | TARGETS += srp-entry | |
| 40 | EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry | |
| 41 | MANPAGES += srp-entry.8 | |
| a373e543 SS |
42 | diff --git a/scripts/ppp-on-rsh b/scripts/ppp-on-rsh |
| 43 | index 30a50db..a80616a 100755 | |
| 44 | --- a/scripts/ppp-on-rsh | |
| 45 | +++ b/scripts/ppp-on-rsh | |
| fa4c11b5 MT |
46 | @@ -26,7 +26,7 @@ PPPD_RHOST=myremotehost |
| 47 | # For this example, we assume that pppd on both local and remote | |
| 48 | # machines reside in the same place, /usr/local/bin/pppd | |
| 49 | # | |
| 50 | -PPPD_LOC=/usr/local/bin/pppd | |
| 51 | +PPPD_LOC=/usr/sbin/pppd | |
| 52 | ||
| 53 | # | |
| 54 | # The location of local options file (where rsh client is running). | |
| a373e543 SS |
55 | diff --git a/scripts/ppp-on-ssh b/scripts/ppp-on-ssh |
| 56 | index 0e41aca..c27e80a 100755 | |
| 57 | --- a/scripts/ppp-on-ssh | |
| 58 | +++ b/scripts/ppp-on-ssh | |
| fa4c11b5 MT |
59 | @@ -26,7 +26,7 @@ PPPD_RHOST=myremotehost |
| 60 | # For this example, we assume that pppd on both local and remote | |
| 61 | # machines reside in the same place, /usr/local/bin/pppd | |
| 62 | # | |
| 63 | -PPPD_LOC=/usr/local/bin/pppd | |
| 64 | +PPPD_LOC=/usr/sbin/pppd | |
| 65 | ||
| 66 | # | |
| 67 | # The location of local options file (where ssh client is running). | |
| 68 | @@ -52,7 +52,7 @@ PPPD_REM_OPT=/etc/ppp/options-ssh-rem | |
| 69 | # | |
| 70 | # The location of ssh client on the local machine | |
| 71 | # | |
| 72 | -SSH_LOC=/usr/local/bin/ssh | |
| 73 | +SSH_LOC=/usr/bin/ssh | |
| 74 | ||
| 75 | export PPPD_LOC PPPD_LOC_OPT PPPD_REM_OPT PPPD_RHOST SSH_LOC | |
| 76 | ||
| a373e543 SS |
77 | diff --git a/scripts/secure-card b/scripts/secure-card |
| 78 | index 0002365..ae3ae50 100755 | |
| 79 | --- a/scripts/secure-card | |
| 80 | +++ b/scripts/secure-card | |
| fa4c11b5 MT |
81 | @@ -1,4 +1,4 @@ |
| 82 | -#!/usr/local/bin/expect -f | |
| 83 | +#!/usr/bin/expect -f | |
| 84 | # | |
| 85 | # This script was written by Jim Isaacson <jcisaac@crl.com>. It is | |
| 86 | # designed to work as a script to use the SecureCARD(tm) device. This | |
| a373e543 SS |
87 | -- |
| 88 | 1.8.3.1 | |
| 89 |