diff --git a/Shorewall-core/install.sh b/Shorewall-core/install.sh
index de7539658..6dc350304 100755
--- a/Shorewall-core/install.sh
+++ b/Shorewall-core/install.sh
@@ -98,8 +98,6 @@ require()
 
 cd "$(dirname $0)"
 
-[ -n "$DESTDIR" ] || DESTDIR="$PREFIX"
-
 #
 # Parse the run line
 #
diff --git a/Shorewall-core/shorewallrc.apple b/Shorewall-core/shorewallrc.apple
index b14fc183d..0818929ea 100644
--- a/Shorewall-core/shorewallrc.apple
+++ b/Shorewall-core/shorewallrc.apple
@@ -3,10 +3,10 @@
 #
 BUILD=apple
 HOST=apple
-USR=/usr
-SHAREDIR=${USR}/share
-LIBEXECDIR=${USR}/share
-PERLLIBDIR=${USR}/share/shorewall
+PREFIX=/usr
+SHAREDIR=${PREFIX}/share
+LIBEXECDIR=${PREFIX}/share
+PERLLIBDIR=${PREFIX}/share/shorewall
 CONFDIR=/etc
 SBINDIR=/sbin
 MANDIR=${SHAREDIR}/man
diff --git a/Shorewall-core/shorewallrc.archlinux b/Shorewall-core/shorewallrc.archlinux
index 9e6f0741d..fe3d30f8d 100644
--- a/Shorewall-core/shorewallrc.archlinux
+++ b/Shorewall-core/shorewallrc.archlinux
@@ -3,10 +3,10 @@
 #
 BUILD=archlinux
 HOST=archlinux
-USR=/usr
-SHAREDIR=${USR}/share
-LIBEXECDIR=${USR}/share
-PERLLIBDIR=${USR}/share/shorewall
+PREFIX=/usr
+SHAREDIR=${PREFIX}/share
+LIBEXECDIR=${PREFIX}/share
+PERLLIBDIR=${PREFIX}/share/shorewall
 CONFDIR=/etc
 SBINDIR=/sbin
 MANDIR=${SHAREDIR}/man
diff --git a/Shorewall-core/shorewallrc.cygwin b/Shorewall-core/shorewallrc.cygwin
index 63fed9c56..f8cfd5bbd 100644
--- a/Shorewall-core/shorewallrc.cygwin
+++ b/Shorewall-core/shorewallrc.cygwin
@@ -3,10 +3,10 @@
 #
 BUILD=cygwin
 HOST=cygwin
-USR=/usr
-SHAREDIR=${USR}/share
-LIBEXECDIR=${USR}/share
-PERLLIBDIR=${USR}/share/shorewall
+PREFIX=/usr
+SHAREDIR=${PREFIX}/share
+LIBEXECDIR=${PREFIX}/share
+PERLLIBDIR=${PREFIX}/share/shorewall
 CONFDIR=/etc
 SBINDIR=/bin
 MANDIR=${SHAREDIR}/man
diff --git a/Shorewall-core/shorewallrc.debian b/Shorewall-core/shorewallrc.debian
index 5f113abcc..6d588fcba 100644
--- a/Shorewall-core/shorewallrc.debian
+++ b/Shorewall-core/shorewallrc.debian
@@ -3,13 +3,13 @@
 #
 BUILD=                                  #Default is to detect the build system
 HOST=debian
-USR=/usr
-SHAREDIR=${USR}/share
-LIBEXECDIR=${USR}/share
-PERLLIBDIR=${USR}/share/shorewall
+PREFIX=/usr
+SHAREDIR=${PREFIX}/share
+LIBEXECDIR=${PREFIX}/share
+PERLLIBDIR=${PREFIX}/share/shorewall
 CONFDIR=/etc
 SBINDIR=/sbin
-MANDIR=${USR}/man
+MANDIR=${PREFIX}/man
 INITDIR=/etc/init.d
 INITFILE=$PRODUCT
 INITSOURCE=init.debian.sh
diff --git a/Shorewall-core/shorewallrc.default b/Shorewall-core/shorewallrc.default
index 20ea342a4..318d96bc3 100644
--- a/Shorewall-core/shorewallrc.default
+++ b/Shorewall-core/shorewallrc.default
@@ -3,13 +3,13 @@
 #
 HOST=                                   #Default is to detect the host system
 BUILD=                                  #Default is to detect the build system
-USR=/usr
-SHAREDIR=${USR}/share
-LIBEXECDIR=${USR}/share
-PERLLIBDIR=${USR}/share/shorewall
+PREFIX=/usr
+SHAREDIR=${PREFIX}/share
+LIBEXECDIR=${PREFIX}/share
+PERLLIBDIR=${PREFIX}/share/shorewall
 CONFDIR=/etc
 SBINDIR=/sbin
-MANDIR=${USR}/man
+MANDIR=${PREFIX}/man
 INITDIR=etc/init.d
 INITFILE=$PRODUCT
 INITSOURCE=init.sh
diff --git a/Shorewall-core/shorewallrc.redhat b/Shorewall-core/shorewallrc.redhat
index 6a3b3015f..f172ad06b 100644
--- a/Shorewall-core/shorewallrc.redhat
+++ b/Shorewall-core/shorewallrc.redhat
@@ -3,9 +3,9 @@
 #
 BUILD=                                  #Default is to detect the build system
 HOST=redhat
-USR=/usr
-SHAREDIR=${USR}/share
-LIBEXECDIR=${USR}/share
+PREFIX=/usr
+SHAREDIR=${PREFIX}/share
+LIBEXECDIR=${PREFIX}/share
 PERLLIBDIR=/usr/share/shorewall
 CONFDIR=/etc
 SBINDIR=/sbin
diff --git a/Shorewall-core/shorewallrc.slackware b/Shorewall-core/shorewallrc.slackware
index 459bcf98c..e0adbfc19 100644
--- a/Shorewall-core/shorewallrc.slackware
+++ b/Shorewall-core/shorewallrc.slackware
@@ -3,13 +3,13 @@
 #
 BUILD=slackware
 HOST=slackware
-USR=/usr
-SHAREDIR=${USR}/share
-LIBEXECDIR=${USR}/share
-PERLLIBDIR=${USR}/share/shorewall
+PREFIX=/usr
+SHAREDIR=${PREFIX}/share
+LIBEXECDIR=${PREFIX}/share
+PERLLIBDIR=${PREFIX}/share/shorewall
 CONFDIR=/etc
 SBINDIR=/sbin
-MANDIR=${USR}/man
+MANDIR=${PREFIX}/man
 INITDIR=/etc/rc.d
 INITSOURCE=init.slackware.firewall
 INITFILE=rc.firewall
diff --git a/Shorewall-core/shorewallrc.suse b/Shorewall-core/shorewallrc.suse
index 89d29c242..316e67d73 100644
--- a/Shorewall-core/shorewallrc.suse
+++ b/Shorewall-core/shorewallrc.suse
@@ -3,11 +3,11 @@
 #
 BUILD=                                  #Default is to detect the build system
 HOST=suse
-USR=/usr
+PREFIX=/usr
 CONFDIR=/etc
-SHAREDIR=${USR}/share
-LIBEXECDIR=${USR}/libexec
-PERLLIBDIR=${USR}/share/shorewall
+SHAREDIR=${PREFIX}/share
+LIBEXECDIR=${PREFIX}/share
+PERLLIBDIR=${PREFIX}/share/shorewall
 SBINDIR=/sbin
 MANDIR=${SHAREDIR}/man/
 INITDIR=/etc/init.d
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 5b482a3bb..f287cd28c 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -109,8 +109,6 @@ else
     Product="Shorewall6 Lite"
 fi
 
-[ -n "$DESTDIR" ] || DESTDIR="$PREFIX"
-
 #
 # Parse the run line
 #
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index ce68dfef2..ffe147fcb 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -115,8 +115,6 @@ else
     Product=Shorewall6
 fi
 
-[ -n "$DESTDIR" ] || DESTDIR="$PREFIX"
-
 #
 # Parse the run line
 #