diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-05-27 08:35:33 +1000 |
|---|---|---|
| committer | Sergey Udaltsov <sergey.udaltsov@gmail.com> | 2020-06-02 20:04:48 +0000 |
| commit | d738be7a9dc9ac0a433a8f4d04976ffc11b30fa2 (patch) | |
| tree | 23f981335eac63dd38e368bc0622427851563a2c /keycodes | |
| parent | 33042d46ede8d7d311b86093ecdcba427f147683 (diff) | |
keycodes: merge the digital_vndr and sgi_vndr subdirs into the main dir
They're just straight installs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'keycodes')
| -rw-r--r-- | keycodes/Makefile.am | 8 | ||||
| -rw-r--r-- | keycodes/digital_vndr/Makefile.am | 4 | ||||
| -rw-r--r-- | keycodes/sgi_vndr/Makefile.am | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/keycodes/Makefile.am b/keycodes/Makefile.am index ac832d7a..0405030d 100644 --- a/keycodes/Makefile.am +++ b/keycodes/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = digital_vndr sgi_vndr - keycodesdir = $(xkb_base)/keycodes dist_keycodes_DATA = \ @@ -19,3 +17,9 @@ dist_keycodes_DATA = \ xfree86 \ xfree98 \ README + +digitaldir = $(keycodesdir)/digital_vndr +dist_digital_DATA = digital_vndr/lk digital_vndr/pc + +sgidir = $(keycodesdir)/sgi_vndr +dist_sgi_DATA = sgi_vndr/indigo sgi_vndr/indy sgi_vndr/iris diff --git a/keycodes/digital_vndr/Makefile.am b/keycodes/digital_vndr/Makefile.am deleted file mode 100644 index 4f4cc4fd..00000000 --- a/keycodes/digital_vndr/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -keycodesdir = $(xkb_base)/keycodes/digital_vndr - -dist_keycodes_DATA = \ -lk pc diff --git a/keycodes/sgi_vndr/Makefile.am b/keycodes/sgi_vndr/Makefile.am deleted file mode 100644 index f601268e..00000000 --- a/keycodes/sgi_vndr/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -keycodesdir = $(xkb_base)/keycodes/sgi_vndr - -dist_keycodes_DATA = \ -indigo indy iris |