[omd-commits] OMD Git: omd: mod_fcgid: fcgid workaround no longer required for centos 7

git version control git at mathias-kettner.de
Fri Jul 11 13:57:04 CEST 2014


Module:   omd
Branch:   master
Commit:   79f3804f8eb7cfdb4b6c8303af14264e2316e9c4
URL:      http://omdistro.org/projects/omd/repository/revisions/79f3804f8eb7cfdb4b6c8303af14264e2316e9c4

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Jul 10 20:45:54 2014 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Jul 10 22:56:32 2014 +0200

mod_fcgid: fcgid workaround no longer required for centos 7

---

 packages/apache-omd/Makefile |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/apache-omd/Makefile b/packages/apache-omd/Makefile
index f5fe7cf..76fc0ff 100644
--- a/packages/apache-omd/Makefile
+++ b/packages/apache-omd/Makefile
@@ -27,11 +27,16 @@ ifeq ("$(wildcard $(APXS))","")
     APXS=apxs
 endif
 
+VERSIONLT7 := $(shell expr $(DISTRO_VERSION) \<= 7)
 ifeq ($(DISTRO_NAME),CENTOS)
-   CENTOS_WORKAROUND=1
+  ifeq ($(VERSIONLT7), 1)
+    CENTOS_WORKAROUND=1
+  endif
 endif
 ifeq ($(DISTRO_NAME),REDHAT)
-  CENTOS_WORKAROUND=1
+  ifeq ($(VERSIONLT7), 1)
+    CENTOS_WORKAROUND=1
+  endif
 endif
 
 ifeq ($(CENTOS_WORKAROUND), 1)



More information about the omd-commits mailing list