Module: check_mk
Branch: master
Commit: d00cce97301f4b4372895a0b0323afa4521e9eee
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d00cce97301f4b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Nov 7 17:29:25 2018 +0100
Ported libgsf Makefile from 1.5.0 branch
Change-Id: I891071b84790c82b5408a7751b35fd5b4c3277c3
---
omd/distros/SLES_15.mk | 16 ++++++++--------
omd/packages/libgsf/Makefile | 4 ++++
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/omd/distros/SLES_15.mk b/omd/distros/SLES_15.mk
index 55393a1..afc2527 100644
--- a/omd/distros/SLES_15.mk
+++ b/omd/distros/SLES_15.mk
@@ -63,14 +63,14 @@ OS_PACKAGES += libltdl7
OS_PACKAGES += libreadline7
OS_PACKAGES += libuuid1
OS_PACKAGES += pango
-OS_PACKAGES += php-fastcgi
-OS_PACKAGES += php-gd
-OS_PACKAGES += php-iconv
-OS_PACKAGES += php-mbstring
-OS_PACKAGES += php-pear
-OS_PACKAGES += php-sockets
-OS_PACKAGES += php-sqlite
-OS_PACKAGES += php-openssl
+OS_PACKAGES += php7-fastcgi
+OS_PACKAGES += php7-gd
+OS_PACKAGES += php7-iconv
+OS_PACKAGES += php7-mbstring
+OS_PACKAGES += php7-pear
+OS_PACKAGES += php7-sockets
+OS_PACKAGES += php7-sqlite
+OS_PACKAGES += php7-openssl
OS_PACKAGES += rsync
OS_PACKAGES += samba-client
OS_PACKAGES += rpcbind
diff --git a/omd/packages/libgsf/Makefile b/omd/packages/libgsf/Makefile
index f184a4d..a01228e 100644
--- a/omd/packages/libgsf/Makefile
+++ b/omd/packages/libgsf/Makefile
@@ -7,12 +7,16 @@ DIR = libgsf-$(VERSION)
.PHONY: build install skel clean
build:
+ifneq ($(filter $(DISTRO_CODE),sles15),)
tar xJf $(DIR).tar.xz
cd $(DIR) && ./configure --prefix=$(OMD_ROOT)
$(MAKE) -C $(DIR)
+endif
install:
+ifneq ($(filter $(DISTRO_CODE),sles15),)
$(MAKE) DESTDIR=$(DESTDIR) -C $(DIR) install
+endif
skel: