summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-01-10 21:02:28 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-01-10 21:02:28 +0000
commita7a2a57f72d2ce4e963f3b27934bccc52e536fe2 (patch)
tree9aba324bc5837803dfd4d32d1ea7b26966a0feb6
parent3f3f85e88874b4e793dc1437afc1b388bdc2f2ae (diff)
downloadtdeartwork-a7a2a57f72d2ce4e963f3b27934bccc52e536fe2.tar.gz
tdeartwork-a7a2a57f72d2ce4e963f3b27934bccc52e536fe2.zip
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
-rw-r--r--kscreensaver/kdesavers/Makefile.am7
1 files changed, 7 insertions, 0 deletions
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