diff options
| author | Alban Browaeys <prahal@yahoo.com> | 2012-04-10 12:35:18 +0200 |
|---|---|---|
| committer | Sergey V. Udaltsov <svu@gnome.org> | 2012-04-10 13:49:44 +0100 |
| commit | b34de22efc5d7849c2fef47e4e9e0dba7311cd8e (patch) | |
| tree | a4d55d72ed0b30ff0b78b3f44d3207cabbba39ca /libgnomekbd | |
| parent | aef59815d15713b9e6d33ef066ba66206abc01e2 (diff) | |
| download | libgnomekbd-b34de22efc5d7849c2fef47e4e9e0dba7311cd8e.tar.gz | |
install : fix install with a DESTDIR (jhbuild)
Spurious double quotes around uidir and iconsdir makes
install attempt to install in '<DESTDIR>"<iconsdir>"'
ie
'/opt/gnome/_jhbuild/root-libgnomekbd\"/opt/gnome/share/libgnomekb/icons\"'
Then install fails to install the data files into the correct directory:
'/opt/gnome/_jhbuild/root-libgnomekbd/opt/gnome/share/libgnomekb/icons'.
It looks like the for loop to install items expands the icons and ui
dirs while the mkdir -p does not.
Fix this issue by removing the double quotes in th Makefile.am around
the iconsdir and uidir assignments.
Diffstat (limited to 'libgnomekbd')
| -rw-r--r-- | libgnomekbd/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am index ed71260..6246760 100644 --- a/libgnomekbd/Makefile.am +++ b/libgnomekbd/Makefile.am @@ -2,10 +2,10 @@ bin_PROGRAMS=gkbd-keyboard-display lib_LTLIBRARIES = libgnomekbd.la libgnomekbdui.la -uidir="$(pkgdatadir)/ui" +uidir=$(pkgdatadir)/ui ui_DATA = show-layout.ui -iconsdir="$(pkgdatadir)/icons" +iconsdir=$(pkgdatadir)/icons icons_DATA = kbdled-caps-lock.svg \ kbdled-num-lock.svg \ kbdled-scroll-lock.svg |