[Nagios-checkins] SF.net SVN: nagios:[2058] nagioscore/trunk

ageric at users.sourceforge.net ageric at users.sourceforge.net
Wed Aug 8 12:20:54 UTC 2012


Revision: 2058
          http://nagios.svn.sourceforge.net/nagios/?rev=2058&view=rev
Author:   ageric
Date:     2012-08-08 12:20:54 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
Silence ridiculous autoconf warnings about datarootdir

It really *should* be up to us if we want to use it or not, but
apparently that's not the case with autoconf >= 2.60, so we get
rid of the warnings by consigning the variable to oblivion where
we don't care about it.

Signed-off-by: Andreas Ericsson <ae at op5.se>

Modified Paths:
--------------
    nagioscore/trunk/Makefile.in
    nagioscore/trunk/html/Makefile.in
    nagioscore/trunk/subst.in

Modified: nagioscore/trunk/Makefile.in
===================================================================
--- nagioscore/trunk/Makefile.in	2012-08-06 16:06:44 UTC (rev 2057)
+++ nagioscore/trunk/Makefile.in	2012-08-08 12:20:54 UTC (rev 2058)
@@ -30,6 +30,7 @@
 CGIDIR=@sbindir@
 LIBEXECDIR=@libexecdir@
 HTMLDIR=@datadir@
+datarootdir=@datarootdir@
 INSTALL=@INSTALL@
 INSTALL_OPTS=@INSTALL_OPTS@
 COMMAND_OPTS=@COMMAND_OPTS@

Modified: nagioscore/trunk/html/Makefile.in
===================================================================
--- nagioscore/trunk/html/Makefile.in	2012-08-06 16:06:44 UTC (rev 2057)
+++ nagioscore/trunk/html/Makefile.in	2012-08-08 12:20:54 UTC (rev 2058)
@@ -9,6 +9,7 @@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
 HTMLDIR=@datadir@
+datarootdir=@datarootdir@
 INSTALL=@INSTALL@
 INSTALL_OPTS=@INSTALL_OPTS@
 COMMAND_OPTS=@COMMAND_OPTS@

Modified: nagioscore/trunk/subst.in
===================================================================
--- nagioscore/trunk/subst.in	2012-08-06 16:06:44 UTC (rev 2057)
+++ nagioscore/trunk/subst.in	2012-08-08 12:20:54 UTC (rev 2058)
@@ -2,9 +2,12 @@
 
 my ${exec_prefix};
 my ${prefix};
+my ${datarootdir};
 
 ${prefix}="@prefix@";
 ${exec_prefix}="@exec_prefix@";
+${datarootdir}="@datarootdir@";
+
 while ($f = shift @ARGV) {
 
 	if (-x "/bin/mktemp") { 
@@ -29,6 +32,7 @@
 		s|\@TMPDIR\@|@TMPDIR@|g;
 		s|\@CHECKRESULTDIR\@|@CHECKRESULTDIR@|g;
 		s|\@datadir\@|@datadir@|g;
+		s|\@datarootdir\@|@datarootdir@|g;
 		s|\@sbindir\@|@sbindir@|g;
 		s|\@bindir\@|@bindir@|g;
 		s|\@htmurl\@|@htmurl@|g;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Nagios-commits mailing list