From 294babcfbb06123cce79dcc7530a27fef4639cf8 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 25 Mar 2012 07:20:40 -0700 Subject: [PATCH] Add USR to the rc files for easier modification Signed-off-by: Tom Eastep --- Shorewall-core/shorewallrc.apple | 14 ++++++++------ Shorewall-core/shorewallrc.archlinux | 9 +++++---- Shorewall-core/shorewallrc.cygwin | 12 +++++++----- Shorewall-core/shorewallrc.debian | 11 ++++++----- Shorewall-core/shorewallrc.default | 12 +++++++----- Shorewall-core/shorewallrc.redhat | 11 +++++++---- Shorewall-core/shorewallrc.slackware | 12 +++++++----- Shorewall-core/shorewallrc.suse | 10 ++++++---- 8 files changed, 53 insertions(+), 38 deletions(-) diff --git a/Shorewall-core/shorewallrc.apple b/Shorewall-core/shorewallrc.apple index 7931f8a6e..b14fc183d 100644 --- a/Shorewall-core/shorewallrc.apple +++ b/Shorewall-core/shorewallrc.apple @@ -3,16 +3,18 @@ # BUILD=apple HOST=apple -SHAREDIR=/usr/share -LIBEXECDIR=/usr/share -PERLLIBDIR=/usr/share/shorewall +USR=/usr +SHAREDIR=${USR}/share +LIBEXECDIR=${USR}/share +PERLLIBDIR=${USR}/share/shorewall CONFDIR=/etc SBINDIR=/sbin -MANDIR=/usr/share/man +MANDIR=${SHAREDIR}/man INITDIR= -INITFILE=none/ +INITFILE= INITSOURCE= ANNOTATED= -SYSCONFDIR= SYSTEMD= +SYSCONFDIR= +SPARSE=Yes VARDIR=/var/lib diff --git a/Shorewall-core/shorewallrc.archlinux b/Shorewall-core/shorewallrc.archlinux index 5f6126490..9e6f0741d 100644 --- a/Shorewall-core/shorewallrc.archlinux +++ b/Shorewall-core/shorewallrc.archlinux @@ -3,12 +3,13 @@ # BUILD=archlinux HOST=archlinux -SHAREDIR=/usr/share -LIBEXECDIR=/usr/share -PERLLIBDIR=/usr/share/shorewall +USR=/usr +SHAREDIR=${USR}/share +LIBEXECDIR=${USR}/share +PERLLIBDIR=${USR}/share/shorewall CONFDIR=/etc SBINDIR=/sbin -MANDIR=/usr/share/man +MANDIR=${SHAREDIR}/man INITDIR=/etc/rc.d INITFILE=$PRODUCT INITSOURCE=init.sh diff --git a/Shorewall-core/shorewallrc.cygwin b/Shorewall-core/shorewallrc.cygwin index 3da1c5434..63fed9c56 100644 --- a/Shorewall-core/shorewallrc.cygwin +++ b/Shorewall-core/shorewallrc.cygwin @@ -3,16 +3,18 @@ # BUILD=cygwin HOST=cygwin -SHAREDIR=/usr/share -LIBEXECDIR=/usr/share -PERLLIBDIR=/usr/share/shorewall +USR=/usr +SHAREDIR=${USR}/share +LIBEXECDIR=${USR}/share +PERLLIBDIR=${USR}/share/shorewall CONFDIR=/etc SBINDIR=/bin -MANDIR=/usr/share/man +MANDIR=${SHAREDIR}/man INITDIR=/etc/init.d INITFILE= INITSOURCE= ANNOTATED= -SYSCONFDIR= SYSTEMD= +SYSCONFDIR= +SPARSE=Yes VARDIR=/var/lib diff --git a/Shorewall-core/shorewallrc.debian b/Shorewall-core/shorewallrc.debian index 4a6b10483..5f113abcc 100644 --- a/Shorewall-core/shorewallrc.debian +++ b/Shorewall-core/shorewallrc.debian @@ -3,18 +3,19 @@ # BUILD= #Default is to detect the build system HOST=debian -SHAREDIR=/usr/share -LIBEXECDIR=/usr/share -PERLLIBDIR=/usr/share/shorewall +USR=/usr +SHAREDIR=${USR}/share +LIBEXECDIR=${USR}/share +PERLLIBDIR=${USR}/share/shorewall CONFDIR=/etc SBINDIR=/sbin -MANDIR=/usr/share/man +MANDIR=${USR}/man INITDIR=/etc/init.d INITFILE=$PRODUCT INITSOURCE=init.debian.sh ANNOTATED= -SPARSE=Yes SYSCONFFILE=default.debian SYSCONFDIR=/etc/default SYSTEMD= +SPARSE=Yes VARDIR=/var/lib diff --git a/Shorewall-core/shorewallrc.default b/Shorewall-core/shorewallrc.default index aa4ee0a34..20ea342a4 100644 --- a/Shorewall-core/shorewallrc.default +++ b/Shorewall-core/shorewallrc.default @@ -3,17 +3,19 @@ # HOST= #Default is to detect the host system BUILD= #Default is to detect the build system -SHAREDIR=/usr/share -LIBEXECDIR=/usr/share -PERLLIBDIR=/usr/share/shorewall +USR=/usr +SHAREDIR=${USR}/share +LIBEXECDIR=${USR}/share +PERLLIBDIR=${USR}/share/shorewall CONFDIR=/etc SBINDIR=/sbin -MANDIR=/usr/share/man -INITDIR=/etc/init.d +MANDIR=${USR}/man +INITDIR=etc/init.d INITFILE=$PRODUCT INITSOURCE=init.sh ANNOTATED= SYSTEMD= +SYSCONFFILE= SYSCONFDIR= SPARSE= VARDIR=/var/lib diff --git a/Shorewall-core/shorewallrc.redhat b/Shorewall-core/shorewallrc.redhat index 40e82e832..6a3b3015f 100644 --- a/Shorewall-core/shorewallrc.redhat +++ b/Shorewall-core/shorewallrc.redhat @@ -3,16 +3,19 @@ # BUILD= #Default is to detect the build system HOST=redhat -SHAREDIR=/usr/share -LIBEXECDIR=/usr/share +USR=/usr +SHAREDIR=${USR}/share +LIBEXECDIR=${USR}/share PERLLIBDIR=/usr/share/shorewall CONFDIR=/etc SBINDIR=/sbin -MANDIR=/usr/share/man +MANDIR=${SHAREDIR}/man INITDIR=/etc/rc.d/init.d INITFILE=$PRODUCT INITSOURCE=init.fedora.sh ANNOTATED= -SYSCONFDIR=/etc/sysconfig/ SYSTEMD=/lib/systemd/system +SYSCONFFILE=sysconfig +SYSCONFDIR=/etc/sysconfig/ +SPARSE= VARDIR=/var/lib diff --git a/Shorewall-core/shorewallrc.slackware b/Shorewall-core/shorewallrc.slackware index e0d2281eb..459bcf98c 100644 --- a/Shorewall-core/shorewallrc.slackware +++ b/Shorewall-core/shorewallrc.slackware @@ -3,18 +3,20 @@ # BUILD=slackware HOST=slackware -SHAREDIR=/usr/share -LIBEXECDIR=/usr/share -PERLLIBDIR=/usr/share/shorewall +USR=/usr +SHAREDIR=${USR}/share +LIBEXECDIR=${USR}/share +PERLLIBDIR=${USR}/share/shorewall CONFDIR=/etc SBINDIR=/sbin -MANDIR=/usr/man +MANDIR=${USR}/man INITDIR=/etc/rc.d INITSOURCE=init.slackware.firewall INITFILE=rc.firewall AUXINITSOURCE=init.slackware.$PRODUCT AUXINITFILE=rc.$PRODUCT +SYSTEMD= +SYSCONFFILE= SYSCONFDIR= ANNOTATED= -SYSTEMD= VARDIR=/var/lib diff --git a/Shorewall-core/shorewallrc.suse b/Shorewall-core/shorewallrc.suse index 047ffc1f5..22dc3687d 100644 --- a/Shorewall-core/shorewallrc.suse +++ b/Shorewall-core/shorewallrc.suse @@ -3,17 +3,19 @@ # BUILD= #Default is to detect the build system HOST=suse -SHAREDIR=/usr/share -LIBEXECDIR=/usr/libexec -PERLLIBDIR=/usr/share/shorewall +USR=/usr +SHAREDIR=${USR}/share +LIBEXECDIR=${USR}/libexec +PERLLIBDIR=${USR}/share/shorewall CONFDIR=/etc SBINDIR=/sbin -MANDIR=/usr/share/man/ +MANDIR=${SHARDIR}/man/ INITDIR=/etc/init.d INITFILE=$PRODUCT INITSOURCE=init.sh ANNOTATED= SYSTEMD= +SYSCONFFILE= SYSCONFDIR=/etc/sysconfig/ SPARSE= VARDIR=/var/lib