From c697936bcd73cedb12eb3cc376c4e9b881cd6890 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Fri, 8 Mar 2002 11:50:56 +0000
Subject: [PATCH] remove accidental hardcoding of /etc SUBST_VARS substitution
 requires ${VARNAME} format

---
 x11/pwm/pkg/DEINSTALL        | 4 ++--
 x11/pwm/pkg/INSTALL          | 4 ++--
 x11/xloadimage/pkg/DEINSTALL | 4 ++--
 x11/xloadimage/pkg/INSTALL   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/x11/pwm/pkg/DEINSTALL b/x11/pwm/pkg/DEINSTALL
index 2e6a622a2f7..10eb63cd188 100644
--- a/x11/pwm/pkg/DEINSTALL
+++ b/x11/pwm/pkg/DEINSTALL
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: DEINSTALL,v 1.1 2002/02/20 12:47:55 naddy Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2002/03/08 11:50:56 naddy Exp $
 # pwm de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR:-/etc}/pwm
+CONFIG_DIR=${SYSCONFDIR}/pwm
 
 if [ -d $CONFIG_DIR ]; then
     echo
diff --git a/x11/pwm/pkg/INSTALL b/x11/pwm/pkg/INSTALL
index 9e30df8efbc..fd8967df87d 100644
--- a/x11/pwm/pkg/INSTALL
+++ b/x11/pwm/pkg/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 # 
-# $OpenBSD: INSTALL,v 1.1 2002/02/20 12:47:55 naddy Exp $
+# $OpenBSD: INSTALL,v 1.2 2002/03/08 11:50:57 naddy Exp $
 # Pre/post-installation setup of pwm
 
 # exit on errors, use a sane path and install prefix
@@ -8,7 +8,7 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR:-/etc}/pwm
+CONFIG_DIR=${SYSCONFDIR}/pwm
 SAMPLE_CONFIG_DIR=$PREFIX/share/examples/pwm
 
 do_notice()
diff --git a/x11/xloadimage/pkg/DEINSTALL b/x11/xloadimage/pkg/DEINSTALL
index bbba5f09c9c..6781a26b3d6 100644
--- a/x11/xloadimage/pkg/DEINSTALL
+++ b/x11/xloadimage/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2001/07/10 21:12:01 naddy Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2002/03/08 11:50:57 naddy Exp $
 #
 # De-installation setup of xloadimage
 
@@ -8,7 +8,7 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=${SYSCONFDIR:-/etc}/xloadimagerc
+CONFIG_FILE=${SYSCONFDIR}/xloadimagerc
 
 # Function: tell the user what they need to do to delete the port completely
 #
diff --git a/x11/xloadimage/pkg/INSTALL b/x11/xloadimage/pkg/INSTALL
index b0b4a730828..ccee83b0b4f 100644
--- a/x11/xloadimage/pkg/INSTALL
+++ b/x11/xloadimage/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.1 2001/07/10 21:12:02 naddy Exp $
+# $OpenBSD: INSTALL,v 1.2 2002/03/08 11:50:57 naddy Exp $
 #
 # Pre/post-installation setup of xloadimage
 
@@ -8,7 +8,7 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=${SYSCONFDIR:-/etc}/xloadimagerc
+CONFIG_FILE=${SYSCONFDIR}/xloadimagerc
 SAMPLE_CONFIG_DIR=$PREFIX/share/examples/xloadimage
 
 # Function: tell the user what they need to do to use the port just installed