[checkmk-commits] Unified variable naming a bit.

Module: check_mk Branch: master Commit: 717323b1d2ad7fefa530e56dece900280c89b2a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=717323b1d2ad7f… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Tue Jan 16 13:57:36 2018 +0100 Unified variable naming a bit. Change-Id: Ifb51eb53f9a23451f8b7d6ae87e3939ad6a81402 --- omd/Makefile.omd | 6 +++--- omd/packages/check_webinject/Makefile | 2 +- omd/packages/jmx4perl/Makefile | 2 +- omd/packages/perl-modules/Makefile | 40 +++++++++++++++++------------------ omd/packages/rrdtool/Makefile | 4 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/omd/Makefile.omd b/omd/Makefile.omd index 8445063..4d04a6d 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -42,9 +42,9 @@ include $(REPO_PATH)/omd/distros/$(DISTRO_NAME)_$(DISTRO_VERSION).mk # Net result -> all Makefiles have now access to the linux distribution # specific settings -PERL := /usr/bin/perl -P5TMPDIST := $(REPO_PATH)/omd/packages/perl-modules/dist -LOCAL_PERL5LIB := $(P5TMPDIST)/dest/lib/perl5 +PERL := /usr/bin/perl +PACKAGE_PERL_MODULES_DESTDIR := $(REPO_PATH)/omd/packages/perl-modules/dist +PACKAGE_PERL_MODULES_PERL5LIB := $(PACKAGE_PERL_MODULES_DESTDIR)/dest/lib/perl5 PACKAGE_PYTHON_DESTDIR := $(REPO_PATH)/omd/packages/python/tmp.python27 PACKAGE_PYTHON_PYTHONPATH := $(PACKAGE_PYTHON_DESTDIR)/lib/python2.7 diff --git a/omd/packages/check_webinject/Makefile b/omd/packages/check_webinject/Makefile index 7dd2d2c..92347fc 100644 --- a/omd/packages/check_webinject/Makefile +++ b/omd/packages/check_webinject/Makefile @@ -12,7 +12,7 @@ build: echo "applying $$p..." ; \ patch -p1 -d $(DIR) < $$p ; \ done - export PERL5LIB=$(LOCAL_PERL5LIB); \ + export PERL5LIB=$(PACKAGE_PERL_MODULES_PERL5LIB); \ cd $(DIR) && echo "" | $(PERL) Makefile.PL cd $(DIR) && $(MAKE) check_webinject diff --git a/omd/packages/jmx4perl/Makefile b/omd/packages/jmx4perl/Makefile index b951169..562e91e 100644 --- a/omd/packages/jmx4perl/Makefile +++ b/omd/packages/jmx4perl/Makefile @@ -13,7 +13,7 @@ build: # echo "applying $$p..." ; \ # ( cd $(DIR) ; patch -p1 -b ) < $$p ; \ # done - export PERL5LIB=$(LOCAL_PERL5LIB); \ + export PERL5LIB=$(PACKAGE_PERL_MODULES_PERL5LIB); \ cd $(DIR) && $(PERL) Build.PL < /dev/null >build.log 2>&1 cd $(DIR) && ./Build diff --git a/omd/packages/perl-modules/Makefile b/omd/packages/perl-modules/Makefile index c30bccf..5cd07f2 100644 --- a/omd/packages/perl-modules/Makefile +++ b/omd/packages/perl-modules/Makefile @@ -83,23 +83,23 @@ MODULES = \ DateTime-1.18.tar.gz build: - mkdir -p $(P5TMPDIST)/dest - mkdir -p $(P5TMPDIST)/src - rsync -a src/. $(P5TMPDIST)/src/. - rsync -a build_module.pl lib $(P5TMPDIST)/src/. - echo "install --install_base $(P5TMPDIST)/dest" > $(P5TMPDIST)/dest/.modulebuildrc + mkdir -p $(PACKAGE_PERL_MODULES_DESTDIR)/dest + mkdir -p $(PACKAGE_PERL_MODULES_DESTDIR)/src + rsync -a src/. $(PACKAGE_PERL_MODULES_DESTDIR)/src/. + rsync -a build_module.pl lib $(PACKAGE_PERL_MODULES_DESTDIR)/src/. + echo "install --install_base $(PACKAGE_PERL_MODULES_DESTDIR)/dest" > $(PACKAGE_PERL_MODULES_DESTDIR)/dest/.modulebuildrc unset LANG; \ unset PERL5LIB; \ unset PERL_MB_OPT; \ unset PERL_LOCAL_LIB_ROOT; \ unset PERL_MM_OPT; \ - export PATH=$(P5TMPDIST)/dest/bin:$$PATH; \ - export PERL_MM_OPT=INSTALL_BASE=$(P5TMPDIST)/dest; \ - export PERL_MB_OPT=--install_base=$(P5TMPDIST)/dest; \ - export MODULEBUILDRC=$(P5TMPDIST)/dest/.modulebuildrc; \ - export PERL5LIB=$(LOCAL_PERL5LIB):$(P5TMPDIST)/src/lib:$(P5TMPDIST)/src/Crypt-SSLeay-0.72; \ - cd $(P5TMPDIST)/src && \ - FORCE=1 ./build_module.pl -d "$(DISTRO)" -p $(P5TMPDIST)/dest \ + export PATH=$(PACKAGE_PERL_MODULES_DESTDIR)/dest/bin:$$PATH; \ + export PERL_MM_OPT=INSTALL_BASE=$(PACKAGE_PERL_MODULES_DESTDIR)/dest; \ + export PERL_MB_OPT=--install_base=$(PACKAGE_PERL_MODULES_DESTDIR)/dest; \ + 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 \ ExtUtils-MakeMaker-*.tar.gz \ parent-*.tar.gz \ version-*.tar.gz \ @@ -108,17 +108,17 @@ build: Types-Serialiser-*.tar.gz \ JSON-*.tar.gz; \ export PERL_JSON_BACKEND='JSON::XS'; \ - cd $(P5TMPDIST)/src && \ - ./build_module.pl -d "$(DISTRO)" -p $(P5TMPDIST)/dest $(MODULES) - cd $(LOCAL_PERL5LIB)/ && rm -f utils.pm && ln -s ../../../nagios/plugins/utils.pm . - mkdir -p $(LOCAL_PERL5LIB)/CPAN - cp MyConfig.pm $(LOCAL_PERL5LIB)/CPAN/MyConfig.skel + cd $(PACKAGE_PERL_MODULES_DESTDIR)/src && \ + ./build_module.pl -d "$(DISTRO)" -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 install: if [ -z $(DESTDIR) ]; then echo "cannot install without DESTDIR set!"; exit 1; fi mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/perl5 $(DESTDIR)$(OMD_ROOT)/bin - rsync -a $(P5TMPDIST)/dest/lib $(DESTDIR)$(OMD_ROOT)/lib/perl5/ - rsync -a $(P5TMPDIST)/dest/bin $(DESTDIR)$(OMD_ROOT)/lib/perl5/ + rsync -a $(PACKAGE_PERL_MODULES_DESTDIR)/dest/lib $(DESTDIR)$(OMD_ROOT)/lib/perl5/ + rsync -a $(PACKAGE_PERL_MODULES_DESTDIR)/dest/bin $(DESTDIR)$(OMD_ROOT)/lib/perl5/ mkdir -p $(DESTDIR)$(OMD_ROOT)/local/lib/perl5 install -m 755 bin/cpan.wrapper $(DESTDIR)$(OMD_ROOT)/bin/cpan.wrapper @@ -126,4 +126,4 @@ skel: echo "install --install_base ###ROOT###/local/lib/perl5" > $(SKEL)/.modulebuildrc clean: - rm -rf src/inc $(P5TMPDIST) + rm -rf src/inc $(PACKAGE_PERL_MODULES_DESTDIR) diff --git a/omd/packages/rrdtool/Makefile b/omd/packages/rrdtool/Makefile index f827431..9ff1d6e 100644 --- a/omd/packages/rrdtool/Makefile +++ b/omd/packages/rrdtool/Makefile @@ -30,7 +30,7 @@ build: check-python check-python-modules export PYTHONPATH=$$PYTHONPATH:$(PACKAGE_PYTHON_PYTHONPATH) ; \ export LD_LIBRARY_PATH=$(PACKAGE_PYTHON_LD_LIBRARY_PATH) ; \ export PATH="$(PACKAGE_PYTHON_BIN):$$PATH" ; \ - export PERL5LIB=$(LOCAL_PERL5LIB); \ + export PERL5LIB=$(PACKAGE_PERL_MODULES_PERL5LIB); \ export PERL_MM_OPT=INSTALL_BASE=$(DESTDIR)$(OMD_ROOT)/lib/perl5; \ export MODULEBUILDRC=$$(pwd)/.modulebuildrc; \ export PKG_CONFIG_PATH="../../glib/glib-2.13.7:../../pango/pango-1.17.5:../../cairo/cairo-1.4.6/src"; \ @@ -53,7 +53,7 @@ install: export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS)" ; \ export LD_LIBRARY_PATH=$(PACKAGE_PYTHON_LD_LIBRARY_PATH) ; \ export PATH="$(PACKAGE_PYTHON_BIN):$$PATH" ; \ - export PERL5LIB=$(LOCAL_PERL5LIB); \ + export PERL5LIB=$(PACKAGE_PERL_MODULES_PERL5LIB); \ $(MAKE) DESTDIR=$(DESTDIR) -C $(DIR) install # clean up perl man pages which end up in wrong location # clean up systemd init files. Note that on RPM based distros this