aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsh Charles <ashcharles@gmail.com>2014-05-26 10:21:12 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2014-06-10 12:16:23 +0200
commitdf58431f76f7d3aadc5e8204d6fe8aa3c2bfc423 (patch)
treee2ca55a018a327e18096ea9b390d59c218903fa4
parent14648c1650bb201a44dac07f1d81189fac24908f (diff)
downloadmeta-openembedded-contrib-df58431f76f7d3aadc5e8204d6fe8aa3c2bfc423.tar.gz
xfce4-settings: Install cursors from srcdir
Cursors patched into the install by 0001-add-cursor-theme-xfce-invisible.patch are located in the source directory. To install during an out-of-tree build, we need to copy them from the source directory, not the current build directory. See [1] for discussion. Upstream-Status: Submitted [1] https://bugzilla.xfce.org/show_bug.cgi?id=9474 Signed-off-by: Ash Charles <ashcharles@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch
index 4d8e01d59f..5de14fc8e2 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch
@@ -223,15 +223,15 @@ index 0000000..c9e5a9f
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)@cursordir@;
-+ $(INSTALL_DATA) index.theme $(DESTDIR)/@cursordir@/..
-+ $(INSTALL_DATA) invisible wait $(DESTDIR)@cursordir@/
++ $(INSTALL_DATA) $(srcdir)/index.theme $(DESTDIR)/@cursordir@/..
++ $(INSTALL_DATA) $(srcdir)/invisible $(srcdir)/wait $(DESTDIR)@cursordir@/
+ for CURSOR in $(CURSOR_NAMES_INVISIBLE); do \
+ echo '-- Installing invisible cursor '$$CURSOR; \
-+ ln -s invisible $(DESTDIR)@cursordir@/$$CURSOR; \
++ ln -s $(srcdir)/invisible $(DESTDIR)@cursordir@/$$CURSOR; \
+ done
+ for CURSOR in $(CURSOR_NAMES); do \
+ echo '-- Installing visible cursor '$$CURSOR; \
-+ ln -s wait $(DESTDIR)@cursordir@/$$CURSOR; \
++ ln -s $(srcdir)/wait $(DESTDIR)@cursordir@/$$CURSOR; \
+ done
+
diff --git a/cursors/index.theme b/cursors/index.theme