summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-11-16 20:02:52 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2012-11-16 20:02:52 -0600
commit8c2536366b60557d0e0dfc9c17cbce45a8d87bc1 (patch)
treecd8585a9db24d00f85889b60ae2e33e04037ceeb
parent527beadab615d0183665a4d2315e59fa2653449b (diff)
parent54c21d3841b359b541eab4f2f76ffd94072280f4 (diff)
downloadtdeartwork-8c2536366b60557d0e0dfc9c17cbce45a8d87bc1.tar.gz
tdeartwork-8c2536366b60557d0e0dfc9c17cbce45a8d87bc1.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeartwork
-rw-r--r--kscreensaver/CMakeLists.txt1
-rw-r--r--kscreensaver/krootbacking/CMakeLists.txt17
-rw-r--r--kscreensaver/krootbacking/Makefile.am2
-rw-r--r--wallpapers/Makefile.am4
4 files changed, 23 insertions, 1 deletions
diff --git a/kscreensaver/CMakeLists.txt b/kscreensaver/CMakeLists.txt
index 0c453adb..31538e9c 100644
--- a/kscreensaver/CMakeLists.txt
+++ b/kscreensaver/CMakeLists.txt
@@ -11,6 +11,7 @@
add_subdirectory( kdesavers )
add_subdirectory( kpartsaver)
+add_subdirectory( krootbacking )
if( WITH_XSCREENSAVER )
add_subdirectory( kxsconfig )
add_subdirectory( xsavers )
diff --git a/kscreensaver/krootbacking/CMakeLists.txt b/kscreensaver/krootbacking/CMakeLists.txt
new file mode 100644
index 00000000..bedfa71e
--- /dev/null
+++ b/kscreensaver/krootbacking/CMakeLists.txt
@@ -0,0 +1,17 @@
+#################################################
+#
+# (C) 2012 Slavek Banko
+# slavek (DOT) banko (AT) axis.cz
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+install(
+ FILES
+ xscreensaver-getimage
+ xscreensaver-getimage-file
+ DESTINATION ${BIN_INSTALL_DIR}
+)
diff --git a/kscreensaver/krootbacking/Makefile.am b/kscreensaver/krootbacking/Makefile.am
index 9bfe161f..4f4d3e3d 100644
--- a/kscreensaver/krootbacking/Makefile.am
+++ b/kscreensaver/krootbacking/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES = $(all_includes)
-hackdir = /usr/local/bin/
+hackdir = $(kde_bindir)
hack_DATA = xscreensaver-getimage xscreensaver-getimage-file
install-data-hook:
diff --git a/wallpapers/Makefile.am b/wallpapers/Makefile.am
index 02bcfa63..e5735c4c 100644
--- a/wallpapers/Makefile.am
+++ b/wallpapers/Makefile.am
@@ -1,9 +1,13 @@
papers_DATA = \
alien-night.jpg \
+ alien-night.jpg.desktop \
kraftwurm.jpg \
+ kraftwurm.jpg.desktop \
kubical.png \
+ kubical.png.desktop \
mystical_rightturn.jpg \
+ mystical_rightturn.jpg.desktop \
Appropriately-Left-Handed-2.jpg \
Superfluous-Organ-1.jpg \
The-Good-Times-1.jpg \