[icinga-checkins] icinga.org: icinga-core/r1.7: core: take use of prefix macro in icinga.xml. in and add this file to configure.in #2609

[git at icinga.org]

Module: icinga-core
Branch: r1.7
Commit: b134975f38ab79a25717a050acfc0b22977ec904
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=b134975f38ab79a25717a050acfc0b22977ec904

Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Tue May 15 21:51:37 2012 +0200

core: take use of prefix macro in icinga.xml.in and add this file to configure.in #2609
refs #2609

---

 configure.in          |    2 +-
 solaris/icinga.xml.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 585f400..a406982 100644
--- a/configure.in
+++ b/configure.in
@@ -1324,7 +1324,7 @@ AC_MSG_CHECKING(for -Wall based on os/compiler)
 
 
 dnl OUTPUT
-AC_OUTPUT(Makefile subst solaris/pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile module/idoutils/Makefile xdata/Makefile daemon-init daemon-init-redhat rc.ido2db module/idoutils/src/Makefile t-tap/Makefile t/Makefile module/idoutils/db/scripts/installdb module/idoutils/db/scripts/upgradedb module/idoutils/db/scripts/prepsql p1.pl)
+AC_OUTPUT(Makefile subst solaris/pkginfo solaris/icinga.xml base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile module/idoutils/Makefile xdata/Makefile daemon-init daemon-init-redhat rc.ido2db module/idoutils/src/Makefile t-tap/Makefile t/Makefile module/idoutils/db/scripts/installdb module/idoutils/db/scripts/upgradedb module/idoutils/db/scripts/prepsql p1.pl)
 
 perl subst $srcdir/include/locations.h
 
diff --git a/solaris/icinga.xml.in b/solaris/icinga.xml.in
index 99681f3..b4cf3f9 100644
--- a/solaris/icinga.xml.in
+++ b/solaris/icinga.xml.in
@@ -10,7 +10,7 @@
                 </dependency>
 
                 <dependency name='icinga_cfg_file' grouping='require_all' restart_on='none' type='path'>
-                        <service_fmri value='file://localhost/usr/local/icinga/etc/icinga.cfg' />
+                        <service_fmri value='file://localhost@prefix@/etc/icinga.cfg' />
                 </dependency>
 
                 <exec_method type='method' name='start'   exec='/lib/svc/method/icinga start' timeout_seconds='60' />