Module: check_mk
Branch: master
Commit: cfe2ebe507be1aaf2e9ea09bac24e13fc9c42bab
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfe2ebe507be1a…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Tue Jan 16 15:58:49 2018 +0100
We already retrieve distro info in Makefile.omd.
Change-Id: I59bc334be14ff82ffe01a5398ef4052bcb3dd9cb
---
omd/packages/cma/Makefile | 1 -
omd/packages/perl-modules/Makefile | 5 ++---
omd/packages/python-modules/Makefile | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/omd/packages/cma/Makefile b/omd/packages/cma/Makefile
index 43f34c9..3262c9d 100644
--- a/omd/packages/cma/Makefile
+++ b/omd/packages/cma/Makefile
@@ -2,7 +2,6 @@ include ../../Makefile.omd
NAME = cma
VERSION = $(OMD_VERSION)
-DISTRO = $(shell ../../distro)
build:
diff --git a/omd/packages/perl-modules/Makefile b/omd/packages/perl-modules/Makefile
index 5cd07f2..c19f432 100644
--- a/omd/packages/perl-modules/Makefile
+++ b/omd/packages/perl-modules/Makefile
@@ -2,7 +2,6 @@ include ../../Makefile.omd
NAME = perl-modules
VERSION = $(OMD_VERSION)
-DISTRO = $(shell ../../distro)
MODULES = \
Capture-Tiny-0.27.tar.gz \
@@ -99,7 +98,7 @@ build:
export MODULEBUILDRC=$(PACKAGE_PERL_MODULES_DESTDIR)/dest/.modulebuildrc; \
export
PERL5LIB=$(PACKAGE_PERL_MODULES_PERL5LIB):$(PACKAGE_PERL_MODULES_DESTDIR)/src/lib:$(PACKAGE_PERL_MODULES_DESTDIR)/src/Crypt-SSLeay-0.72;
\
cd $(PACKAGE_PERL_MODULES_DESTDIR)/src && \
- FORCE=1 ./build_module.pl -d "$(DISTRO)" -p
$(PACKAGE_PERL_MODULES_DESTDIR)/dest \
+ FORCE=1 ./build_module.pl -d "$(DISTRO_INFO)" -p
$(PACKAGE_PERL_MODULES_DESTDIR)/dest \
ExtUtils-MakeMaker-*.tar.gz \
parent-*.tar.gz \
version-*.tar.gz \
@@ -109,7 +108,7 @@ build:
JSON-*.tar.gz; \
export PERL_JSON_BACKEND='JSON::XS'; \
cd $(PACKAGE_PERL_MODULES_DESTDIR)/src && \
- ./build_module.pl -d "$(DISTRO)" -p
$(PACKAGE_PERL_MODULES_DESTDIR)/dest $(MODULES)
+ ./build_module.pl -d "$(DISTRO_INFO)" -p
$(PACKAGE_PERL_MODULES_DESTDIR)/dest $(MODULES)
cd $(PACKAGE_PERL_MODULES_PERL5LIB)/ && rm -f utils.pm && ln -s
../../../nagios/plugins/utils.pm .
mkdir -p $(PACKAGE_PERL_MODULES_PERL5LIB)/CPAN
cp MyConfig.pm $(PACKAGE_PERL_MODULES_PERL5LIB)/CPAN/MyConfig.skel
diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile
index d1e74f7..bb69393 100644
--- a/omd/packages/python-modules/Makefile
+++ b/omd/packages/python-modules/Makefile
@@ -3,7 +3,6 @@ include ../../Makefile.omd
NAME = python-modules
SHELL = /bin/bash
VERSION = $(OMD_VERSION)
-DISTRO = $(shell ../../distro)
PATCHES := $(wildcard patches/*.dif)