From: Ash Charles Date: Mon, 26 May 2014 17:21:12 +0000 (-0700) Subject: xfce4-settings: Install cursors from srcdir X-Git-Tag: rev_ivi_2015_02_04~1969 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04bfb53d90e04463dea780c4c7051c19f2bbbf11;p=scm%2Fbb%2Ftizen-distro.git 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 (From meta-openembedded rev: df58431f76f7d3aadc5e8204d6fe8aa3c2bfc423) Signed-off-by: Ash Charles Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch index 4d8e01d..5de14fc 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch +++ b/meta-openembedded/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