From a7a2a57f72d2ce4e963f3b27934bccc52e536fe2 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 10 Jan 2010 21:02:28 +0000 Subject: [PATCH] Fixed libart KClock desktop file stomping on applink KClock desktop file git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeartwork@1072752 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kscreensaver/kdesavers/Makefile.am | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kscreensaver/kdesavers/Makefile.am b/kscreensaver/kdesavers/Makefile.am index 8f399401..4ef77086 100644 --- a/kscreensaver/kdesavers/Makefile.am +++ b/kscreensaver/kdesavers/Makefile.am @@ -92,10 +92,17 @@ noinst_HEADERS = banner.h polygon.h slideshow.h lines.h\ pics_DATA = kscience.png particle.png image.png picsdir = $(kde_datadir)/kscreensaver +if COMPILE_LIBART_KSAVERS +desktop_DATA = KBanner.desktop KPolygon.desktop \ + KSlideshow.desktop KLines-saver.desktop KLorenz.desktop \ + KBlob.desktop KVm.desktop \ + $(X11_DESKTOP_FILES) $(GL_DESKTOP_FILES) $(LIBART_DESKTOP_FILES) $(ARTS_GL_DESKTOP_FILES) +else desktop_DATA = KBanner.desktop KPolygon.desktop \ KSlideshow.desktop KLines-saver.desktop KLorenz.desktop \ KBlob.desktop KVm.desktop \ KClock.desktop $(X11_DESKTOP_FILES) $(GL_DESKTOP_FILES) $(LIBART_DESKTOP_FILES) $(ARTS_GL_DESKTOP_FILES) +endif desktopdir = $(kde_appsdir)/System/ScreenSavers