summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-10 03:33:42 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-10 03:33:42 +0000
commit8d9011bb98dcdd3dc026385c5066124514e81215 (patch)
treecf70faa187044f39b544d672a0766bdafa101294
parent6a82df4dbca4b5fb82ac2e93645395a835b8460d (diff)
rules: Set XKB_DATA root for installing in debian/tmp
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 99b187a3..3b9507da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ hurd (20120710-1) UNRELEASED; urgency=low
- patches/libdde_fixes.patch: Remove, merged upstream.
- patches/ext2fs_large_stores.patch: Refresh.
* hurd-console.default: Get keyboard layout from console-setup.
+ * rules: Set XKB_DATA root for installing in debian/tmp.
-- Samuel Thibault <sthibault@debian.org> Tue, 10 Jul 2012 01:36:55 +0000
diff --git a/debian/rules b/debian/rules
index 7ab667a3..a2c77a78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
DEB_CONFIGURE_USER_FLAGS := --disable-profile --enable-static-progs='ext2fs,ufs,iso9660fs'
-DEB_MAKE_INSTALL_TARGET = install prefix=$(DEB_DESTDIR) sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var
+DEB_MAKE_INSTALL_TARGET = install prefix=$(DEB_DESTDIR) sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb
DEB_DH_STRIP_ARGS := --dbg-package=hurd
DEB_DH_MAKESHLIBS_ARGS_hurd := --add-udeb="hurd-udeb"