From 33042d46ede8d7d311b86093ecdcba427f147683 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 27 May 2020 08:35:33 +1000 Subject: geometry: merge the digital_vndr and sgi_vndr subdirs into the main dir They're just straight installs. Signed-off-by: Peter Hutterer --- geometry/Makefile.am | 14 ++++++++++++-- geometry/digital_vndr/Makefile.am | 4 ---- geometry/sgi_vndr/Makefile.am | 4 ---- 3 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 geometry/digital_vndr/Makefile.am delete mode 100644 geometry/sgi_vndr/Makefile.am (limited to 'geometry') diff --git a/geometry/Makefile.am b/geometry/Makefile.am index 82b1432..d88bc9f 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 821c0cc..0000000 --- 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 5c76e4b..0000000 --- a/geometry/sgi_vndr/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -geomdir = $(xkb_base)/geometry/sgi_vndr - -dist_geom_DATA = \ -indigo indy O2 -- cgit v1.2.1