Rename USR to PREFIX

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-03-27 07:47:22 -07:00
parent e09457cdf9
commit e1e4855211
11 changed files with 34 additions and 40 deletions

View File

@ -98,8 +98,6 @@ require()
cd "$(dirname $0)" cd "$(dirname $0)"
[ -n "$DESTDIR" ] || DESTDIR="$PREFIX"
# #
# Parse the run line # Parse the run line
# #

View File

@ -3,10 +3,10 @@
# #
BUILD=apple BUILD=apple
HOST=apple HOST=apple
USR=/usr PREFIX=/usr
SHAREDIR=${USR}/share SHAREDIR=${PREFIX}/share
LIBEXECDIR=${USR}/share LIBEXECDIR=${PREFIX}/share
PERLLIBDIR=${USR}/share/shorewall PERLLIBDIR=${PREFIX}/share/shorewall
CONFDIR=/etc CONFDIR=/etc
SBINDIR=/sbin SBINDIR=/sbin
MANDIR=${SHAREDIR}/man MANDIR=${SHAREDIR}/man

View File

@ -3,10 +3,10 @@
# #
BUILD=archlinux BUILD=archlinux
HOST=archlinux HOST=archlinux
USR=/usr PREFIX=/usr
SHAREDIR=${USR}/share SHAREDIR=${PREFIX}/share
LIBEXECDIR=${USR}/share LIBEXECDIR=${PREFIX}/share
PERLLIBDIR=${USR}/share/shorewall PERLLIBDIR=${PREFIX}/share/shorewall
CONFDIR=/etc CONFDIR=/etc
SBINDIR=/sbin SBINDIR=/sbin
MANDIR=${SHAREDIR}/man MANDIR=${SHAREDIR}/man

View File

@ -3,10 +3,10 @@
# #
BUILD=cygwin BUILD=cygwin
HOST=cygwin HOST=cygwin
USR=/usr PREFIX=/usr
SHAREDIR=${USR}/share SHAREDIR=${PREFIX}/share
LIBEXECDIR=${USR}/share LIBEXECDIR=${PREFIX}/share
PERLLIBDIR=${USR}/share/shorewall PERLLIBDIR=${PREFIX}/share/shorewall
CONFDIR=/etc CONFDIR=/etc
SBINDIR=/bin SBINDIR=/bin
MANDIR=${SHAREDIR}/man MANDIR=${SHAREDIR}/man

View File

@ -3,13 +3,13 @@
# #
BUILD= #Default is to detect the build system BUILD= #Default is to detect the build system
HOST=debian HOST=debian
USR=/usr PREFIX=/usr
SHAREDIR=${USR}/share SHAREDIR=${PREFIX}/share
LIBEXECDIR=${USR}/share LIBEXECDIR=${PREFIX}/share
PERLLIBDIR=${USR}/share/shorewall PERLLIBDIR=${PREFIX}/share/shorewall
CONFDIR=/etc CONFDIR=/etc
SBINDIR=/sbin SBINDIR=/sbin
MANDIR=${USR}/man MANDIR=${PREFIX}/man
INITDIR=/etc/init.d INITDIR=/etc/init.d
INITFILE=$PRODUCT INITFILE=$PRODUCT
INITSOURCE=init.debian.sh INITSOURCE=init.debian.sh

View File

@ -3,13 +3,13 @@
# #
HOST= #Default is to detect the host system HOST= #Default is to detect the host system
BUILD= #Default is to detect the build system BUILD= #Default is to detect the build system
USR=/usr PREFIX=/usr
SHAREDIR=${USR}/share SHAREDIR=${PREFIX}/share
LIBEXECDIR=${USR}/share LIBEXECDIR=${PREFIX}/share
PERLLIBDIR=${USR}/share/shorewall PERLLIBDIR=${PREFIX}/share/shorewall
CONFDIR=/etc CONFDIR=/etc
SBINDIR=/sbin SBINDIR=/sbin
MANDIR=${USR}/man MANDIR=${PREFIX}/man
INITDIR=etc/init.d INITDIR=etc/init.d
INITFILE=$PRODUCT INITFILE=$PRODUCT
INITSOURCE=init.sh INITSOURCE=init.sh

View File

@ -3,9 +3,9 @@
# #
BUILD= #Default is to detect the build system BUILD= #Default is to detect the build system
HOST=redhat HOST=redhat
USR=/usr PREFIX=/usr
SHAREDIR=${USR}/share SHAREDIR=${PREFIX}/share
LIBEXECDIR=${USR}/share LIBEXECDIR=${PREFIX}/share
PERLLIBDIR=/usr/share/shorewall PERLLIBDIR=/usr/share/shorewall
CONFDIR=/etc CONFDIR=/etc
SBINDIR=/sbin SBINDIR=/sbin

View File

@ -3,13 +3,13 @@
# #
BUILD=slackware BUILD=slackware
HOST=slackware HOST=slackware
USR=/usr PREFIX=/usr
SHAREDIR=${USR}/share SHAREDIR=${PREFIX}/share
LIBEXECDIR=${USR}/share LIBEXECDIR=${PREFIX}/share
PERLLIBDIR=${USR}/share/shorewall PERLLIBDIR=${PREFIX}/share/shorewall
CONFDIR=/etc CONFDIR=/etc
SBINDIR=/sbin SBINDIR=/sbin
MANDIR=${USR}/man MANDIR=${PREFIX}/man
INITDIR=/etc/rc.d INITDIR=/etc/rc.d
INITSOURCE=init.slackware.firewall INITSOURCE=init.slackware.firewall
INITFILE=rc.firewall INITFILE=rc.firewall

View File

@ -3,11 +3,11 @@
# #
BUILD= #Default is to detect the build system BUILD= #Default is to detect the build system
HOST=suse HOST=suse
USR=/usr PREFIX=/usr
CONFDIR=/etc CONFDIR=/etc
SHAREDIR=${USR}/share SHAREDIR=${PREFIX}/share
LIBEXECDIR=${USR}/libexec LIBEXECDIR=${PREFIX}/share
PERLLIBDIR=${USR}/share/shorewall PERLLIBDIR=${PREFIX}/share/shorewall
SBINDIR=/sbin SBINDIR=/sbin
MANDIR=${SHAREDIR}/man/ MANDIR=${SHAREDIR}/man/
INITDIR=/etc/init.d INITDIR=/etc/init.d

View File

@ -109,8 +109,6 @@ else
Product="Shorewall6 Lite" Product="Shorewall6 Lite"
fi fi
[ -n "$DESTDIR" ] || DESTDIR="$PREFIX"
# #
# Parse the run line # Parse the run line
# #

View File

@ -115,8 +115,6 @@ else
Product=Shorewall6 Product=Shorewall6
fi fi
[ -n "$DESTDIR" ] || DESTDIR="$PREFIX"
# #
# Parse the run line # Parse the run line
# #