[omd-commits] OMD Git: omd: Removed new realpath call (not available on all distros)

git version control git at mathias-kettner.de
Sun Jun 5 17:45:27 CEST 2016


Module:   omd
Branch:   master
Commit:   4f88b8479f706be885a50fec56f8d70dfed55511
URL:      http://omdistro.org/projects/omd/repository/revisions/4f88b8479f706be885a50fec56f8d70dfed55511

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 17:45:24 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 17:45:24 2016 +0200

Removed new realpath call (not available on all distros)

---

 packages/mod_python/Makefile     |    2 +-
 packages/python-modules/Makefile |    5 +++--
 packages/rrdtool/Makefile        |    2 +-
 packages/shinken/Makefile        |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/mod_python/Makefile b/packages/mod_python/Makefile
index f5b842d..cfcf683 100644
--- a/packages/mod_python/Makefile
+++ b/packages/mod_python/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 NAME     = mod_python
 VERSION  = 3.3.1
 DIR      = $(NAME)-$(VERSION)
-PYTHON   = $(shell realpath $$(pwd)/../python/tmp.python27/bin/python)
+PYTHON   = $(shell pwd)/../python/tmp.python27/bin/python
 
 CONFIGUREOPTS = \
     --prefix=$(OMD_ROOT) \
diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index 5ee5d30..755bc5a 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 NAME     = python-modules
 VERSION  = $(OMD_VERSION)
 DISTRO   = $(shell ../../distro)
-PYTHON   = $(shell realpath $$(pwd)/../python/tmp.python27/bin/python)
+PYTHON   = $(shell pwd)/../python/tmp.python27/bin/python
 
 MODULES =
 # Modules really needed on all platforms
@@ -33,7 +33,8 @@ build: check-python
 	    ( cd dest ; patch -p1 -b ) < $$p ; \
 	done
 	set -e ; cd dest && \
-	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python:$(shell realpath $$(pwd)/../python/tmp.python27/lib/python2.7) ; \
+	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
+	    export PYTHONPATH=$$PYTHONPATH:$(shell pwd)/../python/tmp.python27/lib/python2.7 ; \
 	    for M in $$(ls); do \
 		echo "Building $$M..." ; \
 		cd $$M ; \
diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile
index 81a8697..27e69a6 100644
--- a/packages/rrdtool/Makefile
+++ b/packages/rrdtool/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 NAME = rrdtool
 VERSION = 1.5.4
 DIR = $(NAME)-$(VERSION)
-PYTHON = $(shell realpath $$(pwd)/../python/tmp.python27/bin/python)
+PYTHON = $(shell pwd)/../python/tmp.python27/bin/python
 
 CONFIGUREOPTS = \
 	--prefix=$(OMD_ROOT) \
diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile
index c684ae8..17e98e3 100644
--- a/packages/shinken/Makefile
+++ b/packages/shinken/Makefile
@@ -1,6 +1,6 @@
 include ../../Makefile.omd
 
-PYTHON=$(shell realpath $$(pwd)/../python/tmp.python27/bin/python)
+PYTHON=$(shell pwd)/../python/tmp.python27/bin/python
 
 SHINKEN=shinken-1.4.1
 SHINKEN_FILE=$(SHINKEN).tar.gz



More information about the omd-commits mailing list