etc -> SYSCONFDIR

This commit is contained in:
sturm 2003-04-26 15:02:31 +00:00
parent aec565d316
commit 4d0a3ffd55
2 changed files with 16 additions and 4 deletions

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_gated_paths_h_in,v 1.1 2003/04/26 15:02:31 sturm Exp $
--- src/gated/paths.h.in.orig Sat Apr 26 16:23:52 2003
+++ src/gated/paths.h.in Sat Apr 26 16:24:03 2003
@@ -35,7 +35,7 @@
* __END_OF_COPYRIGHT__
*/
-#define _PATH_CONFIG "/etc/%s.conf"
+#define _PATH_CONFIG "@sysconfdir@/%s.conf"
#define _PATH_DEFS "/usr/include/isode"
#define _PATH_DUMP "@DUMPDIR@/%s_dump"
#define _PATH_DUMPDIR "@DUMPDIR@"

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: DEINSTALL,v 1.1 2000/08/15 17:12:37 jakob Exp $
# $OpenBSD: DEINSTALL,v 1.2 2003/04/26 15:02:31 sturm Exp $
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
@ -10,7 +10,7 @@ if id gii >/dev/null 2>&1 ; then
fi
GII_LINE=`grep ^gii /etc/services`
if [ -n "$GII_LINE" -o -f /etc/gated.conf -o "x$HAVE_USER" = "xYES" ]; then
if [ -n "$GII_LINE" -o -f ${SYSCONFDIR}/gated.conf -o "x$HAVE_USER" = "xYES" ]; then
echo
echo "+---------------"
@ -27,9 +27,9 @@ if [ -n "$GII_LINE" -o -f /etc/gated.conf -o "x$HAVE_USER" = "xYES" ]; then
echo "| $GII_LINE"
echo "|"
fi
if [ -f /etc/gated.conf ]; then
if [ -f ${SYSCONFDIR}/gated.conf ]; then
echo "| - remove gated configuration file"
echo "| rm /etc/gated.conf"
echo "| rm ${SYSCONFDIR}/gated.conf"
echo "|"
fi
echo "| Do not do this if you plan on re-installing $1"