From 3c0936803265cda81589cebcc4e67f9dc525d3cf Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 11 Apr 2012 15:41:21 -0700 Subject: [PATCH] Make changes suggested by Orion Poplawski - Change shorewallrc.redhat LIBEXECDIR and PERLLIBDIR settings - Install -lite Makefiles in ${SHAREDIR}/${PRODUCT}/ Signed-off-by: Tom Eastep --- Shorewall-core/shorewallrc.redhat | 4 ++-- Shorewall-lite/install.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Shorewall-core/shorewallrc.redhat b/Shorewall-core/shorewallrc.redhat index cf1c693d0..851f1d0c0 100644 --- a/Shorewall-core/shorewallrc.redhat +++ b/Shorewall-core/shorewallrc.redhat @@ -5,8 +5,8 @@ BUILD= #Default is to detect the build system HOST=redhat PREFIX=/usr #Top-level directory for shared files, libraries, etc. SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. -LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. -PERLLIBDIR=/usr/share/shorewall #Directory to install Shorewall Perl module directory +LIBEXECDIR=${PREFIX}/libexec #Directory for executable scripts. +PERLLIBDIR=/usr/share/perl5 #Directory to install Shorewall Perl module directory CONFDIR=/etc #Directory where subsystem configurations are installed SBINDIR=/sbin #Directory where system administration programs are installed MANDIR=${SHAREDIR}/man #Directory where manpages are installed. diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 8e4e97562..43d780a5a 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -373,8 +373,8 @@ fi # # Install the Makefile # -run_install $OWNERSHIP -m 0600 Makefile ${DESTDIR}${CONFDIR}/$PRODUCT -echo "Makefile installed as ${DESTDIR}${CONFDIR}/$PRODUCT/Makefile" +run_install $OWNERSHIP -m 0600 Makefile ${DESTDIR}${SHAREDIR}/$PRODUCT +echo "Makefile installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/Makefile" # # Install the default config path file