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 | 33042d46ede8d7d311b86093ecdcba427f147683 (patch) | |
| tree | 5a99e7739428534e86302fd9fc973726e2da82bd /geometry | |
| parent | 50c533cb4db4deb22164df7f4515afc15477566d (diff) | |
geometry: 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 'geometry')
| -rw-r--r-- | geometry/Makefile.am | 14 | ||||
| -rw-r--r-- | geometry/digital_vndr/Makefile.am | 4 | ||||
| -rw-r--r-- | geometry/sgi_vndr/Makefile.am | 4 |
3 files changed, 12 insertions, 10 deletions
diff --git a/geometry/Makefile.am b/geometry/Makefile.am index 82b14322..d88bc9f5 100644 --- a/geometry/Makefile.am +++ b/geometry/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = digital_vndr sgi_vndr - geomdir = $(xkb_base)/geometry dist_geom_DATA = \ @@ -9,3 +7,15 @@ dist_geom_DATA = \ macintosh microsoft nec nokia \ northgate pc sanwa sony thinkpad \ sun teck steelseries typematrix winbook README + +digitaldir = $(geomdir)/digital_vndr +dist_digital_DATA = \ + digital_vndr/lk \ + digital_vndr/pc \ + digital_vndr/unix + +sgidir = $(geomdir)/sgi_vndr +dist_sgi_DATA = \ + sgi_vndr/indigo \ + sgi_vndr/indy \ + sgi_vndr/O2 diff --git a/geometry/digital_vndr/Makefile.am b/geometry/digital_vndr/Makefile.am deleted file mode 100644 index 821c0ccf..00000000 --- a/geometry/digital_vndr/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -geomdir = $(xkb_base)/geometry/digital_vndr - -dist_geom_DATA = \ -lk pc unix diff --git a/geometry/sgi_vndr/Makefile.am b/geometry/sgi_vndr/Makefile.am deleted file mode 100644 index 5c76e4b4..00000000 --- a/geometry/sgi_vndr/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -geomdir = $(xkb_base)/geometry/sgi_vndr - -dist_geom_DATA = \ -indigo indy O2 |