diff options
author | François Andriot <albator78@libertysurf.fr> | 2014-06-18 19:33:34 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2014-06-18 19:33:34 +0200 |
commit | ca6bbdcf85658a61f8c0a6a8132310bb53809c2c (patch) | |
tree | 1f663ba6e3b49913fc0c5854bed867f3c1730632 /redhat/Makefile.v3.5.13-sru | |
parent | 470510a717da8d95508202f27e28b23c88f5d7e7 (diff) | |
download | tde-packaging-ca6bbdcf85658a61f8c0a6a8132310bb53809c2c.tar.gz tde-packaging-ca6bbdcf85658a61f8c0a6a8132310bb53809c2c.zip |
RPM Packaging: update 3.5.13.2 for RHEL7
Diffstat (limited to 'redhat/Makefile.v3.5.13-sru')
-rw-r--r-- | redhat/Makefile.v3.5.13-sru | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/redhat/Makefile.v3.5.13-sru b/redhat/Makefile.v3.5.13-sru index c8c2e61ff..c8f449346 100644 --- a/redhat/Makefile.v3.5.13-sru +++ b/redhat/Makefile.v3.5.13-sru @@ -114,8 +114,8 @@ tdewebdev: tdebase tdesdk ### 3rd party libraries and tools esound: -# Build on Mageia only -ifneq ($(wildcard /etc/mageia-release),) +# Build on Mageia and CentOS >= 7 +ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) $(call buildpkg,3rdparty/esound) endif @@ -138,8 +138,8 @@ ifeq ($(wildcard /etc/centos-release),) endif htdig: -# build on Mageia only -ifneq ($(wildcard /etc/mageia-release),) +# build on Mageia, and CentOS >= 7 +ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) $(call buildpkg,3rdparty/htdig) endif @@ -399,7 +399,7 @@ kpicosim: tdebase $(call buildpkg,applications/kpicosim) kpilot: tdebase -# Do NOT build on CentOS 5 +# Do NOT build on CentOS 5 (pilot-link library is too old) ifeq ($(wildcard /boot/vmlinuz*.el5*),) $(call buildpkg,applications/kpilot) endif |