[icinga-checkins] icinga.org: icinga-core/next: ATTENTION, breaking changes - idomod.o: $bindir => $libdir, new $libdir introduced #2346 #2347

git at icinga.org git at icinga.org
Sat Feb 25 21:16:31 CET 2012


Module: icinga-core
Branch: next
Commit: 65d67ce355756c20519215eae36c775fb4ff3438
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=65d67ce355756c20519215eae36c775fb4ff3438

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Feb 23 22:00:34 2012 +0100

ATTENTION, breaking changes - idomod.o: $bindir => $libdir, new $libdir introduced #2346 #2347

install: change default target location of idomod.o from $bindir to $libdir #2346
install: introduce "lib/" in default prefix install for modules #2347

refs #2346
refs #2347

---

 Changelog                                     |   13 +++++++++++++
 Makefile.in                                   |    1 +
 base/Makefile.in                              |    2 ++
 cgi/Makefile.in                               |    1 +
 common/Makefile.in                            |    1 +
 configure                                     |    4 ++++
 configure.in                                  |    2 ++
 contrib/Makefile.in                           |    1 +
 html/Makefile.in                              |    1 +
 module/Makefile.in                            |    1 +
 module/idoutils/Makefile.in                   |    1 +
 module/idoutils/config/idoutils.cfg-sample.in |    2 +-
 module/idoutils/src/Makefile.in               |    4 +++-
 sample-config/icinga.cfg.in                   |    2 +-
 subst.in                                      |    1 +
 t-tap/Makefile.in                             |    1 +
 16 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index 5972dab..f248ef3 100644
--- a/Changelog
+++ b/Changelog
@@ -6,6 +6,8 @@ Thanks to all contributers, testers and developers. Please read AUTHORS and THAN
 
 1.7.0 - XX/YY/2012
 
+!!! ATTENTION - idomod.o will now be installed to $libdir instead of $bindir !!!
+
 ENHANCEMENTS
 * core: notifications: Create contact list after eventbroker callbacks (Andreas Ericsson) #2110
 * core: fix event removal from queues with O(1) removal from doubly linked lists (Andreas Ericsson) #2183
@@ -15,6 +17,9 @@ ENHANCEMENTS
 
 * install: add configure option --with-temp-file=<filepath> to set temp_file for icinga.cfg #2121
 * install: add --with-plugin-dir to configure for setting the plugins path accordingly #2344
+* install: change default target location of idomod.o from $bindir to $libdir #2346
+	** packagers dreams come finally true! :)
+* install: introduce "lib/" in default prefix install for modules #2347
 
 * icinga.spec: use --with-plugin-dir instead of --libexexdir for nagios plugins dir #2344
 
@@ -29,12 +34,20 @@ FIXES
 CHANGES
 * neb api: move creation of notification contact list AFTER event broker callback NEBTYPE_NOTIFICATION_START #2110
 	** allows neb modules to cancel/override notification list creation on notification start
+
 * debug: set debug_verbosity=2 by default
+
 * install: --with-temp-file=<filepath> #2121
 	** sets path to an Icinga exclusive update temp file i.e. /tmp/icinga.tmp
+
 * install: --with-plugin-dir=<path> #2344
 	** sets path to plugins directory path i.e. $prefix/libexec
 
+* install: change default target location of idomod.o from $bindir to $libdir #2346
+	** make sure to UPDATE the location in your CONFIG !!!
+
+* install: introduce "lib/" in default prefix install for modules #2347
+
 
 
 
diff --git a/Makefile.in b/Makefile.in
index 7352876..242ae76 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,6 +39,7 @@ EXTCMDFILEDIR=@EXTCMDFILEDIR@
 P1FILELOC=@P1FILELOC@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
+LIBDIR=@libdir@
 CGIDIR=@sbindir@
 LIBEXECDIR=@libexecdir@
 HTMLDIR=@datarootdir@
diff --git a/base/Makefile.in b/base/Makefile.in
index 197e4c0..95f1612 100644
--- a/base/Makefile.in
+++ b/base/Makefile.in
@@ -35,6 +35,7 @@ exec_prefix=@exec_prefix@
 LOGDIR=@localstatedir@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
+LIBDIR=@libdir@
 CGIDIR=@sbindir@
 HTMLDIR=@datarootdir@
 INSTALL=@INSTALL@
@@ -207,6 +208,7 @@ install-unstripped:
 
 install-basic:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
 	$(INSTALL) -m 774 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR)
 	$(INSTALL) -m 774 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR)
 
diff --git a/cgi/Makefile.in b/cgi/Makefile.in
index d26d631..acd0c29 100644
--- a/cgi/Makefile.in
+++ b/cgi/Makefile.in
@@ -13,6 +13,7 @@ exec_prefix=@exec_prefix@
 LOGDIR=@CGILOGDIR@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
+LIBDIR=@libdir@
 CGIDIR=@sbindir@
 HTMLDIR=@datarootdir@
 CGILOGDIR=@CGILOGDIR@
diff --git a/common/Makefile.in b/common/Makefile.in
index d16c633..0ddba11 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -15,6 +15,7 @@ exec_prefix=@exec_prefix@
 LOGDIR=@localstatedir@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
+LIBDIR=@libdir@
 CGIDIR=@sbindir@
 HTMLDIR=@datarootdir@
 INSTALL=@INSTALL@
diff --git a/configure b/configure
index dc98333..9275fa5 100755
--- a/configure
+++ b/configure
@@ -8526,6 +8526,10 @@ $as_echo "        Install \${prefix}:  $prefix" >&6; }
 $as_echo "                Lock file:  $lockfile" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:                 Temp file:  $TMPFILE" >&5
 $as_echo "                Temp file:  $TMPFILE" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:             Lib directory:  $libdir" >&5
+$as_echo "            Lib directory:  $libdir" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:             Bin directory:  $bindir" >&5
+$as_echo "            Bin directory:  $bindir" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:          Plugin directory:  $PLUGINDIR" >&5
 $as_echo "         Plugin directory:  $PLUGINDIR" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:             Log directory:  $LOGDIR" >&5
diff --git a/configure.in b/configure.in
index 0618535..51b4298 100644
--- a/configure.in
+++ b/configure.in
@@ -1346,6 +1346,8 @@ fi
 AC_MSG_RESULT([        Install \${prefix}:  $prefix])
 AC_MSG_RESULT([                Lock file:  $lockfile])
 AC_MSG_RESULT([                Temp file:  $TMPFILE])
+AC_MSG_RESULT([            Lib directory:  $libdir])
+AC_MSG_RESULT([            Bin directory:  $bindir])
 AC_MSG_RESULT([         Plugin directory:  $PLUGINDIR])
 AC_MSG_RESULT([            Log directory:  $LOGDIR])
 AC_MSG_RESULT([        cgi log directory:  $CGILOGDIR])
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index 90e758b..af8eb19 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -21,6 +21,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 CGIDIR=@sbindir@
 BINDIR=@bindir@
+LIBDIR=@libdir@
 
 CGIS=traceroute.cgi daemonchk.cgi
 UTILS=mini_epn new_mini_epn convertcfg
diff --git a/html/Makefile.in b/html/Makefile.in
index 5b2ecc3..0e78ca7 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -7,6 +7,7 @@ exec_prefix=@exec_prefix@
 LOGDIR=@localstatedir@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
+LIBDIR=@libdir@
 CGIDIR=@sbindir@
 HTMLDIR=@datarootdir@
 CGILOGDIR=@CGILOGDIR@
diff --git a/module/Makefile.in b/module/Makefile.in
index 6de9eb8..4632003 100644
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -16,6 +16,7 @@ LIBS=@LIBS@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 BINDIR=@bindir@
+LIBDIR=@libdir@
 INSTALL=@INSTALL@
 INSTALL_OPTS=@INSTALL_OPTS@
 COMMAND_OPTS=@COMMAND_OPTS@
diff --git a/module/idoutils/Makefile.in b/module/idoutils/Makefile.in
index 3d8d66b..4edd9c2 100644
--- a/module/idoutils/Makefile.in
+++ b/module/idoutils/Makefile.in
@@ -13,6 +13,7 @@ exec_prefix=@exec_prefix@
 LOGDIR=@localstatedir@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
+LIBDIR=@libdir@
 LIBEXECDIR=@libexecdir@
 CGIDIR=@sbindir@
 INSTALL=@INSTALL@
diff --git a/module/idoutils/config/idoutils.cfg-sample.in b/module/idoutils/config/idoutils.cfg-sample.in
index 7210e1a..ce0771e 100644
--- a/module/idoutils/config/idoutils.cfg-sample.in
+++ b/module/idoutils/config/idoutils.cfg-sample.in
@@ -7,6 +7,6 @@
 define module{
         module_name     idomod
         module_type     neb
-        path            @bindir@/idomod.o
+        path            @libdir@/idomod.o
         args            config_file=@sysconfdir@/idomod.cfg
 	}
diff --git a/module/idoutils/src/Makefile.in b/module/idoutils/src/Makefile.in
index 4673dda..ee8f5e4 100644
--- a/module/idoutils/src/Makefile.in
+++ b/module/idoutils/src/Makefile.in
@@ -12,6 +12,7 @@ exec_prefix=@exec_prefix@
 LOGDIR=@localstatedir@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
+LIBDIR=@libdir@
 LIBEXECDIR=@libexecdir@
 CGIDIR=@sbindir@
 INSTALL=@INSTALL@
@@ -105,7 +106,8 @@ devclean: distclean
 
 install:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
 	$(INSTALL) -m 774 $(INSTALL_OPTS) ido2db $(DESTDIR)$(BINDIR)
 	$(INSTALL) -m 774 $(INSTALL_OPTS) log2ido $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 774 $(INSTALL_OPTS) idomod.o $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 774 $(INSTALL_OPTS) idomod.o $(DESTDIR)$(LIBDIR)
 
diff --git a/sample-config/icinga.cfg.in b/sample-config/icinga.cfg.in
index 4fc8029..cae695e 100644
--- a/sample-config/icinga.cfg.in
+++ b/sample-config/icinga.cfg.in
@@ -253,7 +253,7 @@ event_broker_options=-1
 #broker_module=/somewhere/module2.o arg1 arg2=3 debug=0
 
 # Uncomment this to enable idomod.o
-#broker_module=@bindir@/idomod.o config_file=@sysconfdir@/idomod.cfg
+#broker_module=@libdir@/idomod.o config_file=@sysconfdir@/idomod.cfg
 
 
 
diff --git a/subst.in b/subst.in
index 30ce49e..dc06a4e 100755
--- a/subst.in
+++ b/subst.in
@@ -38,6 +38,7 @@ while ($f = shift @ARGV) {
 		s|\@datadir\@|@datarootdir@|g;
 		s|\@sbindir\@|@sbindir@|g;
 		s|\@bindir\@|@bindir@|g;
+		s|\@libdir\@|@libdir@|g;
 		s|\@htmurl\@|@htmurl@|g;
 		s|\@cgiurl\@|@cgiurl@|g;
 		s|\@MAIL_PROG\@|@MAIL_PROG@|g;
diff --git a/t-tap/Makefile.in b/t-tap/Makefile.in
index 7dfbb06..a773fc0 100644
--- a/t-tap/Makefile.in
+++ b/t-tap/Makefile.in
@@ -43,6 +43,7 @@ exec_prefix=@exec_prefix@
 LOGDIR=@localstatedir@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
+LIBDIR=@libdir@
 CGIDIR=@sbindir@
 HTMLDIR=@datarootdir@
 INSTALL=@INSTALL@





More information about the icinga-checkins mailing list