Pārlūkot izejas kodu

Minor changes for OpenBSD

John C. Frickson 9 gadi atpakaļ
vecāks
revīzija
c3e220ed23
2 mainītis faili ar 16 papildinājumiem un 4 dzēšanām
  1. 8 2
      build-aux/ax_nagios_get_paths
  2. 8 2
      configure

+ 8 - 2
build-aux/ax_nagios_get_paths

@@ -226,7 +226,7 @@ else
 	if test x"$sysconfdir" = x'${prefix}/etc'; then AS_UNSET(sysconfdir); fi
 
 	if test x"$prefix" = "xNONE"; then
-		if test $dist_type = freebsd; then
+		if test $dist_type = freebsd -o $dist_type = openbsd; then
 			prefix="/usr/local"
 		elif test $dist_type = netbsd; then
 			prefix="/usr/pkg"
@@ -488,7 +488,11 @@ elif test $opsys = "bsd"; then
 	if test $dist_type = freebsd -o $dist_type = openbsd; then
 		prefix=${prefix="/usr/local"}
 		exec_prefix=${exec_prefix="/usr/local"}
-		install_method="$install_method : FreeBSD"
+		if test $dist_type = freebsd; then
+			install_method="$install_method : FreeBSD"
+		else
+			install_method="$install_method : OpenBSD"
+		fi
 	elif test $dist_type = netbsd; then
 		prefix=${prefix="/usr/pkg"}
 		exec_prefix=${exec_prefix="/usr/pkg"}
@@ -508,6 +512,8 @@ elif test $opsys = "bsd"; then
 	fi
 	if test $dist_type = freebsd; then
 		sysconfdir=${sysconfdir="/usr/local/etc"}
+	else
+		sysconfdir=${sysconfdir="/etc"}
 	fi
 	pkgsysconfdir=${pkgsysconfdir="$sysconfdir/nagios"}
 	if test $need_etc_subdir = yes; then

+ 8 - 2
configure

@@ -3292,7 +3292,7 @@ else
 	if test x"$sysconfdir" = x'${prefix}/etc'; then { sysconfdir=; unset sysconfdir;}; fi
 
 	if test x"$prefix" = "xNONE"; then
-		if test $dist_type = freebsd; then
+		if test $dist_type = freebsd -o $dist_type = openbsd; then
 			prefix="/usr/local"
 		elif test $dist_type = netbsd; then
 			prefix="/usr/pkg"
@@ -3556,7 +3556,11 @@ elif test $opsys = "bsd"; then
 	if test $dist_type = freebsd -o $dist_type = openbsd; then
 		prefix=${prefix="/usr/local"}
 		exec_prefix=${exec_prefix="/usr/local"}
-		install_method="$install_method : FreeBSD"
+		if test $dist_type = freebsd; then
+			install_method="$install_method : FreeBSD"
+		else
+			install_method="$install_method : OpenBSD"
+		fi
 	elif test $dist_type = netbsd; then
 		prefix=${prefix="/usr/pkg"}
 		exec_prefix=${exec_prefix="/usr/pkg"}
@@ -3576,6 +3580,8 @@ elif test $opsys = "bsd"; then
 	fi
 	if test $dist_type = freebsd; then
 		sysconfdir=${sysconfdir="/usr/local/etc"}
+	else
+		sysconfdir=${sysconfdir="/etc"}
 	fi
 	pkgsysconfdir=${pkgsysconfdir="$sysconfdir/nagios"}
 	if test $need_etc_subdir = yes; then