diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2018-07-02 13:47:40 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2018-07-02 13:47:40 +0000 |
| commit | a2eafec30b40cf6a484500fd02fb69aef80c9dd0 (patch) | |
| tree | 63b1f976c30f03f3dd2caf528694d967d1f5e71d /sysutils/munin-common/files/patch-Makefile | |
| parent | - Update to 3.1.1 (diff) | |
Update to 2.0.38.
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=473739
Diffstat (limited to 'sysutils/munin-common/files/patch-Makefile')
| -rw-r--r-- | sysutils/munin-common/files/patch-Makefile | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sysutils/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile index b9907103e0f0..2286984fcace 100644 --- a/sysutils/munin-common/files/patch-Makefile +++ b/sysutils/munin-common/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2017-03-03 00:02:39 UTC +--- Makefile.orig 2018-06-29 00:50:01 UTC +++ Makefile @@ -68,60 +68,47 @@ install: install-master-prime install-co @@ -88,7 +88,7 @@ # Not ready to be installed yet # $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/ -@@ -139,33 +126,29 @@ endif +@@ -131,36 +118,30 @@ install-node-plugins: install-plugins-pr install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config @$(CHECKGROUP) @@ -105,6 +105,8 @@ + mkdir -p $(DESTDIR)$(LIBDIR)/plugins + mkdir -p $(DESTDIR)$(PLUGSTATE) + @# Process the OS specific plugins at the end. Otherwise they would be overridden by the + @# generic ones. for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ if test -f "$$p" ; then \ echo Installing $$p; \ @@ -112,10 +114,10 @@ + $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ fi \ done -- $(HPUXONLY) mv $(LIBDIR)/plugins/*.adv $(LIBDIR) +- @# Some HP-UX plugins need *.adv support files in LIBDIR +- if [ "$(OSTYPE)" = "hp-ux" ]; then mv $(LIBDIR)/plugins/*.adv $(LIBDIR); done - $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/ - $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/ -+ $(HPUXONLY) mv $(DESTDIR)$(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ + $(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ @@ -134,7 +136,7 @@ fi \ done -@@ -176,14 +159,14 @@ install-plugins-java: build-plugins-java +@@ -171,14 +152,14 @@ install-plugins-java: build-plugins-java install-async-prime: install-async install-async: @@ -153,7 +155,7 @@ install-common-prime: build-common install-common -@@ -449,7 +432,7 @@ t/install: +@@ -444,7 +425,7 @@ t/install: # This builds */Build from Build.PL %/Build: %/Build.PL @@ -162,7 +164,7 @@ build-%: %/Build cd $* && $(PERL) Build -@@ -466,6 +449,7 @@ install-%: %/Build +@@ -461,6 +442,7 @@ install-%: %/Build --install_path sbin=$(SBINDIR) \ --install_path bindoc=$(MANDIR)/man1 \ --install_path libdoc=$(MANDIR)/man3 \ |