diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-10-01 20:01:06 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-10-01 20:01:06 +0200 |
| commit | cd987458557f4163072c33effd4df34e7e8a4288 (patch) | |
| tree | 90cf7aecf9dfd20f03572e6d81f38c3a9cc36120 /redhat/Makefile.r14 | |
| parent | fc5d3c8d01e679b569e18b13488363cadb5e1d7f (diff) | |
| parent | 4ed48b596a3124deac51b66df656c57f9f88c4d9 (diff) | |
| download | tde-packaging-cd987458557f4163072c33effd4df34e7e8a4288.tar.gz tde-packaging-cd987458557f4163072c33effd4df34e7e8a4288.zip | |
merge
Diffstat (limited to 'redhat/Makefile.r14')
| -rw-r--r-- | redhat/Makefile.r14 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index ce1887dd1..f7ea7839f 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -100,7 +100,7 @@ tdegames: tdebase tdemultimedia tdegraphics: tdebase poppler cmake $(call buildpkg,tdegraphics) -tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake +tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt $(call buildpkg,tdelibs) tdemultimedia: tdebase akode @@ -143,7 +143,7 @@ endif cmake: # Build on CentOS only ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) - $(call buildpkg,3rdparty/cmake) +# $(call buildpkg,3rdparty/cmake) endif esound: @@ -250,6 +250,11 @@ endif akode: tqtinterface $(call buildpkg,extras/akode) +cmake-macros: cmake +ifneq ($(wildcard /etc/SuSE-release),) + $(call buildpkg,extras/trinity-cmake-macros) +endif + ### Trinity Libraries kipi-plugins: tqtinterface libkipi $(call buildpkg,libraries/kipi-plugins) |