[omd-commits] OMD Git: omd: shinken: Makefile cosmetics

git version control git at mathias-kettner.de
Mon Jun 3 00:20:46 CEST 2013


Module:   omd
Branch:   master
Commit:   35b299d9b2aafd59d3837b4991542fb4188242fc
URL:      http://omdistro.org/projects/omd/repository/revisions/35b299d9b2aafd59d3837b4991542fb4188242fc

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Mon Jun  3 00:20:40 2013 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Mon Jun  3 00:20:40 2013 +0200

shinken: Makefile cosmetics

---

 packages/shinken/Makefile |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile
index 9b3d3ed..6915cc4 100644
--- a/packages/shinken/Makefile
+++ b/packages/shinken/Makefile
@@ -31,18 +31,14 @@ MP_URL=http://pypi.python.org/packages/source/m/multiprocessing/$(MP_FILE)
 ifeq ($(DISTRO_NAME),CENTOS)
   ifeq ($(DISTRO_VERSION),$(filter $(DISTRO_VERSION),5.4 5.5 5.6 5.7 5.8 5.9))
     SJSON=simplejson-2.1.2
-    SJSON_FILE=$(SJSON).tar.gz
-    SJSON_URL=http://pypi.python.org/packages/source/s/simplejson/$(SJSON_FILE)
   else
     SJSON=simplejson-3.3.0
-    SJSON_FILE=$(SJSON).tar.gz
-    SJSON_URL=http://pypi.python.org/packages/source/s/simplejson/$(SJSON_FILE)
   endif
 else
   SJSON=simplejson-3.3.0
-  SJSON_FILE=$(SJSON).tar.gz
-  SJSON_URL=http://pypi.python.org/packages/source/s/simplejson/$(SJSON_FILE)
 endif
+SJSON_FILE=$(SJSON).tar.gz
+SJSON_URL=http://pypi.python.org/packages/source/s/simplejson/$(SJSON_FILE)
 #
 # Setup-Tools (needed to install Pyro on CentOS)
 STOOLS=setuptools-0.6c11



More information about the omd-commits mailing list