diff options
Diffstat (limited to 'net-mgmt/icinga/files/patch-Makefile.in')
| -rw-r--r-- | net-mgmt/icinga/files/patch-Makefile.in | 227 |
1 files changed, 217 insertions, 10 deletions
diff --git a/net-mgmt/icinga/files/patch-Makefile.in b/net-mgmt/icinga/files/patch-Makefile.in index c507f1dd3377..2fc4572ec18b 100644 --- a/net-mgmt/icinga/files/patch-Makefile.in +++ b/net-mgmt/icinga/files/patch-Makefile.in @@ -1,6 +1,204 @@ ---- Makefile.in.orig 2013-05-10 08:48:51.000000000 +0200 -+++ Makefile.in 2013-05-10 08:50:03.000000000 +0200 -@@ -427,8 +427,8 @@ install-basic: +--- Makefile.in.orig 2013-12-05 12:51:35.000000000 +0100 ++++ Makefile.in 2013-12-19 17:32:03.300358603 +0100 +@@ -141,16 +141,16 @@ none: + ############################### + + all: +- cd $(SRC_BASE) && $(MAKE) +- cd $(SRC_CGI) && $(MAKE) +- cd $(SRC_HTM) && $(MAKE) ++ $(MAKE) -C $(SRC_BASE) ++ $(MAKE) -C $(SRC_CGI) ++ $(MAKE) -C $(SRC_HTM) + + if [ x$(USE_EVENTBROKER) = xyes ]; then \ +- cd $(SRC_MODULE) && $(MAKE); \ ++ $(MAKE) -C $(SRC_MODULE); \ + fi + + @if [ x$(USE_IDOUTILS) = xyes ]; then \ +- cd $(SRC_IDOUTILS) && $(MAKE); \ ++ $(MAKE) -C $(SRC_IDOUTILS); \ + fi + + @echo "" +@@ -218,7 +218,7 @@ all: + @echo "" + + icinga: +- cd $(SRC_BASE) && $(MAKE) ++ $(MAKE) -C $(SRC_BASE) + + config: + @echo "Sample config files are automatically generated once you run the" +@@ -226,11 +226,11 @@ config: + @echo "system by using the 'make install-config' command." + + cgis: +- cd $(SRC_CGI) && $(MAKE) ++ $(MAKE) -C $(SRC_CGI) + + idoutils: + @if [ x$(USE_IDOUTILS) = xyes ]; then \ +- cd $(SRC_IDOUTILS) && $(MAKE); \ ++ $(MAKE) -C $(SRC_IDOUTILS); \ + else \ + echo "" ;\ + echo "Sorry, IDOUtils not enabled!" ;\ +@@ -239,13 +239,13 @@ idoutils: + fi + + html: +- cd $(SRC_HTM) && $(MAKE) ++ $(MAKE) -C $(SRC_HTM) + + contrib: +- cd $(SRC_CONTRIB) && $(MAKE) ++ $(MAKE) -C $(SRC_CONTRIB) + + modules: +- cd $(SRC_MODULE) && $(MAKE) ++ $(MAKE) -C $(SRC_MODULE) + + classicui-standalone: cgis + +@@ -259,35 +259,35 @@ classicui-standalone: cgis + ############################### + + clean: +- cd $(SRC_BASE) && $(MAKE) $@ +- cd $(SRC_CGI) && $(MAKE) $@ +- cd $(SRC_COMMON) && $(MAKE) $@ +- cd $(SRC_XDATA) && $(MAKE) $@ +- cd $(SRC_HTM) && $(MAKE) $@ +- cd $(SRC_INCLUDE) && $(MAKE) $@ +- cd $(SRC_CONTRIB) && $(MAKE) $@ +- cd $(SRC_MODULE) && $(MAKE) $@ +- cd $(SRC_IDOUTILS) && $(MAKE) $@ +- cd $(SRC_TTAP) && $(MAKE) $@ +- cd $(SRC_T) && $(MAKE) $@ +- cd $(SRC_TAP) && $(MAKE) $@; \ ++ $(MAKE) -C $(SRC_BASE) $@ ++ $(MAKE) -C $(SRC_CGI) $@ ++ $(MAKE) -C $(SRC_COMMON) $@ ++ $(MAKE) -C $(SRC_XDATA) $@ ++ $(MAKE) -C $(SRC_HTM) $@ ++ $(MAKE) -C $(SRC_INCLUDE) $@ ++ $(MAKE) -C $(SRC_CONTRIB) $@ ++ $(MAKE) -C $(SRC_MODULE) $@ ++ $(MAKE) -C $(SRC_IDOUTILS) $@ ++ $(MAKE) -C $(SRC_TTAP) $@ ++ $(MAKE) -C $(SRC_T) $@ ++ $(MAKE) -C $(SRC_TAP) $@; \ + + rm -f *.cfg core + rm -f *~ *.*~ */*~ */*.*~ */*/*.*~ + + distclean: clean +- cd $(SRC_BASE) && $(MAKE) $@ +- cd $(SRC_CGI) && $(MAKE) $@ +- cd $(SRC_COMMON) && $(MAKE) $@ +- cd $(SRC_XDATA) && $(MAKE) $@ +- cd $(SRC_HTM) && $(MAKE) $@ +- cd $(SRC_INCLUDE) && $(MAKE) $@ +- cd $(SRC_CONTRIB) && $(MAKE) $@ +- cd $(SRC_MODULE) && $(MAKE) $@ +- cd $(SRC_IDOUTILS) && $(MAKE) $@ +- cd $(SRC_TTAP) && $(MAKE) $@ +- cd $(SRC_T) && $(MAKE) $@ +- cd $(SRC_TAP) && $(MAKE) $@; \ ++ $(MAKE) -C $(SRC_BASE) $@ ++ $(MAKE) -C $(SRC_CGI) $@ ++ $(MAKE) -C $(SRC_COMMON) $@ ++ $(MAKE) -C $(SRC_XDATA) $@ ++ $(MAKE) -C $(SRC_HTM) $@ ++ $(MAKE) -C $(SRC_INCLUDE) $@ ++ $(MAKE) -C $(SRC_CONTRIB) $@ ++ $(MAKE) -C $(SRC_MODULE) $@ ++ $(MAKE) -C $(SRC_IDOUTILS) $@ ++ $(MAKE) -C $(SRC_TTAP) $@ ++ $(MAKE) -C $(SRC_T) $@ ++ $(MAKE) -C $(SRC_TAP) $@; \ + + rm -f sample-config/*.cfg sample-config/*.conf sample-config/template-object/*.cfg + rm -f daemon-init pkginfo rc.ido2db ido2db-systemd icinga-systemd sysconfig-env +@@ -308,13 +308,13 @@ test: + $(MAKE) test-tap + + test-tap: tools/libtap/tap.o icinga cgis +- cd $(SRC_TTAP) && $(MAKE) test; ++ $(MAKE) -C $(SRC_TTAP) test; + + tools/libtap/tap.o: +- cd tools/libtap && $(MAKE) ++ $(MAKE) -C tools/libtap + + test-perl: icinga cgis +- cd t && $(MAKE) test ++ $(MAKE) -C t test + + ############################### + # Package +@@ -328,8 +328,8 @@ create-docs: copy-docs-style + #${MAKE} submodule-init + #${MAKE} submodule-update + #${MAKE} submodule-update-latest +- cd ${SRC_DOCBOOK_EN} && make en +- cd ${SRC_DOCBOOK_DE} && make de ++ $(MAKE) -C ${SRC_DOCBOOK_EN} en ++ $(MAKE) -C ${SRC_DOCBOOK_DE} de + cp ${SRC_DOCBOOK_IMAGES}/*.png ${SRC_DOCS_IMAGES}/ + @echo "updated docs :)" + +@@ -366,37 +366,33 @@ submodule-update-latest: + + + install-html: +- cd $(SRC_HTM) && $(MAKE) install ++ $(MAKE) -C $(SRC_HTM) install + + install-dev-docu: +- cd $(SRC_HTM) && $(MAKE) install-dev-docu ++ $(MAKE) -C $(SRC_HTM) install-dev-docu + + install-base: +- cd $(SRC_BASE) && $(MAKE) install ++ $(MAKE) -C $(SRC_BASE) install + + install-cgis: +- cd $(SRC_CGI) && $(MAKE) install ++ $(MAKE) -C $(SRC_CGI) install + + install: +- cd $(SRC_BASE) && $(MAKE) $@ +- cd $(SRC_CGI) && $(MAKE) $@ +- cd $(SRC_HTM) && $(MAKE) $@ ++ $(MAKE) -C $(SRC_BASE) $@ ++ $(MAKE) -C $(SRC_CGI) $@ ++ $(MAKE) -C $(SRC_HTM) $@ + + $(MAKE) install-basic + + install-unstripped: +- cd $(SRC_BASE) && $(MAKE) $@ +- cd $(SRC_CGI) && $(MAKE) $@ +- cd $(SRC_HTM) && $(MAKE) $@ ++ $(MAKE) -C $(SRC_BASE) $@ ++ $(MAKE) -C $(SRC_CGI) $@ ++ $(MAKE) -C $(SRC_HTM) $@ + + $(MAKE) install-basic + + install-basic: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(STATEDIR) + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR) + if [ $(INSTALLPERLSTUFF) = yes ]; then \ + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(P1FILELOC); \ + $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(P1FILELOC); \ +@@ -439,8 +435,8 @@ install-basic: install-cgiconf: $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) @@ -11,7 +209,7 @@ install-config: install-cgiconf -@@ -436,17 +436,17 @@ install-config: install-cgiconf +@@ -448,17 +444,17 @@ install-config: install-cgiconf $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/conf.d $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules @@ -40,21 +238,30 @@ @echo "" @echo "*** Config files installed ***" -@@ -464,7 +464,7 @@ install-testconfig: +@@ -476,7 +472,7 @@ install-testconfig: install-webconf: $(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF) - $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE) + $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE)-sample - - @echo "" - @echo "*** Icinga/Apache conf file installed ***" -@@ -472,7 +472,7 @@ install-webconf: - + @if [ x$(APACHE24_DEBIAN) = xyes ]; then \ + echo " Debian Apache 2.4 detected. " ;\ + echo " Run 'a2enconf icinga' and 'service apache2 reload'" ;\ +@@ -489,7 +485,7 @@ install-webconf: install-webconf-auth: + $(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF) - $(INSTALL) -b -m 644 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE) + $(INSTALL) -b -m 644 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE)-sample @echo "" @echo "*** Icinga http auth file installed ***" +@@ -498,7 +494,7 @@ install-webconf-auth: + + install-idoutils: + @if [ x$(USE_IDOUTILS) = xyes ]; then \ +- cd $(SRC_IDOUTILS) && $(MAKE) $@ ;\ ++ $(MAKE) -C $(SRC_IDOUTILS) $@ ;\ + fi + @if [ x$(USE_IDOUTILS) = xyes ]; then \ + echo "" ;\ |