diff options
| author | svu <svu> | 2005-08-06 15:59:05 +0000 |
|---|---|---|
| committer | svu <svu> | 2005-08-06 15:59:05 +0000 |
| commit | 8effeaeeaa272fd7375f6983a668b45695b60339 (patch) | |
| tree | b0ae35ff925c9e4f3866e80d2278283af79863d1 | |
| parent | cc10f76ec1feb16a193d751bf2ff52393e0380ef (diff) | |
| download | xkeyboard-config-8effeaeeaa272fd7375f6983a668b45695b60339.tar.gz | |
fixing xkbcomp symlink
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 15 |
2 files changed, 16 insertions, 7 deletions
@@ -1,6 +1,12 @@ +2005-08-06 svu + + * Makefile.am: + Fixing the xkbcomp symlink creation + Thanks to Daniel Stone for the feedback + 2005-08-04 svu - * *Makefile.am, configure.in, xkbrules.am: + * Makefile.am, configure.in, xkbrules.am: Taking nice ideas from xkbdata. Thanks to Daniel Stone for his knowledge of autofoo diff --git a/Makefile.am b/Makefile.am index d4ffb92..b7fbc88 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,14 +12,17 @@ DISTCLEANFILES=intltool-extract intltool-merge intltool-update dnl ACLOCAL_AMFLAGS = -I m4 -if CREATE_XKBCOMP_SYMLINK -install-data-hook: - ln -sf ../../../bin/xkbcomp $(DESTDIR)$(xkb_base)/xkbcomp +install-compiled: rm -f $(DESTDIR)$(xkb_base)/compiled ln -sf /var/lib/xkb $(DESTDIR)$(xkb_base)/compiled + +if CREATE_XKBCOMP_SYMLINK +install-xkbcomp: + ln -sf $(XKBCOMP) $(DESTDIR)$(xkb_base)/xkbcomp + else -install-data-hook: - rm -f $(DESTDIR)$(xkb_base)/compiled - ln -sf /var/lib/xkb $(DESTDIR)$(xkb_base)/compiled +install-xkbcomp: endif + +install-data-hook: install-compiled install-xkbcomp |