[checkmk-commits] Unified local DESTDIR paths a bit.

Module: check_mk Branch: master Commit: 4b3eb0d931e2171324c7378412dcea22d0d84aa9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b3eb0d931e217… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 16 14:00:17 2018 +0100 Unified local DESTDIR paths a bit. Change-Id: I3307a2e81a65f3b43fecc7757ef6888e6ab0a921 --- omd/Makefile.omd | 4 ++-- omd/packages/perl-modules/.gitignore | 2 +- omd/packages/python/.gitignore | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/omd/Makefile.omd b/omd/Makefile.omd index 4d04a6d..3f36e33 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -43,10 +43,10 @@ include $(REPO_PATH)/omd/distros/$(DISTRO_NAME)_$(DISTRO_VERSION).mk # specific settings PERL := /usr/bin/perl -PACKAGE_PERL_MODULES_DESTDIR := $(REPO_PATH)/omd/packages/perl-modules/dist +PACKAGE_PERL_MODULES_DESTDIR := $(REPO_PATH)/omd/packages/perl-modules/destdir PACKAGE_PERL_MODULES_PERL5LIB := $(PACKAGE_PERL_MODULES_DESTDIR)/dest/lib/perl5 -PACKAGE_PYTHON_DESTDIR := $(REPO_PATH)/omd/packages/python/tmp.python27 +PACKAGE_PYTHON_DESTDIR := $(REPO_PATH)/omd/packages/python/destdir PACKAGE_PYTHON_PYTHONPATH := $(PACKAGE_PYTHON_DESTDIR)/lib/python2.7 PACKAGE_PYTHON_LDFLAGS := -L$(PACKAGE_PYTHON_DESTDIR)/lib -L$(PACKAGE_PYTHON_PYTHONPATH)/config PACKAGE_PYTHON_LD_LIBRARY_PATH := $(PACKAGE_PYTHON_DESTDIR)/lib diff --git a/omd/packages/perl-modules/.gitignore b/omd/packages/perl-modules/.gitignore index 9f031f5..0d847a6 100644 --- a/omd/packages/perl-modules/.gitignore +++ b/omd/packages/perl-modules/.gitignore @@ -1,2 +1,2 @@ -dist +destdir/ .deps.cache diff --git a/omd/packages/python/.gitignore b/omd/packages/python/.gitignore index 1304f35..b5d449b 100644 --- a/omd/packages/python/.gitignore +++ b/omd/packages/python/.gitignore @@ -1,4 +1,4 @@ Python-2.7.1? bin/ build/ -tmp.python27 +destdir/