single script for the layouts 2-4

5 files changed, 18 insertions, 37 deletions

diff --git a/rules/compat/Makefile.am b/rules/compat/Makefile.am
index 258f5a63..01b30ad9 100644
--- a/rules/compat/Makefile.am
+++ b/rules/compat/Makefile.am
@@ -1,7 +1,7 @@
 
 transform_files=layoutRename.lst
 
-transform_scripts=l2_s.sh l3_s.sh l4_s.sh ml1_s.sh ml_s.sh
+transform_scripts=ln_s.sh ml1_s.sh ml_s.sh
 
 
 if USE_COMPAT_RULES
@@ -15,14 +15,14 @@ noinst_SCRIPTS=
 
 endif
 
-base.l2_s.part: l2_s.sh
-	sh $<
+base.l2_s.part: ln_s.sh
+	sh $< 2
 
-base.l3_s.part: l3_s.sh
-	sh $<
+base.l3_s.part: ln_s.sh
+	sh $< 3
 
-base.l4_s.part: l4_s.sh
-	sh $<
+base.l4_s.part: ln_s.sh
+	sh $< 4
 
 base.ml1_s.part: ml1_s.sh
 	sh $<
diff --git a/rules/compat/l2_s.sh b/rules/compat/l2_s.sh
deleted file mode 100755
index 6d057368..00000000
--- a/rules/compat/l2_s.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-
-OUTFILE=base.l2_s.part
-
-> $OUTFILE
-
-awk '{ 
-  printf "  %s		=	+%s%%(v[2]):2\n", $1, $2; 
-}' < layoutRename.lst >> $OUTFILE
diff --git a/rules/compat/l3_s.sh b/rules/compat/l3_s.sh
deleted file mode 100755
index 1172216e..00000000
--- a/rules/compat/l3_s.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-
-OUTFILE=base.l3_s.part
-
-> $OUTFILE
-
-awk '{ 
-  printf "  %s		=	+%s%%(v[3]):3\n", $1, $2; 
-}' < layoutRename.lst >> $OUTFILE
diff --git a/rules/compat/l4_s.sh b/rules/compat/l4_s.sh
deleted file mode 100755
index ab46336f..00000000
--- a/rules/compat/l4_s.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-
-OUTFILE=base.l4_s.part
-
-> $OUTFILE
-
-awk '{ 
-  printf "  %s		=	+%s%%(v[4]):4\n", $1, $2; 
-}' < layoutRename.lst >> $OUTFILE
diff --git a/rules/compat/ln_s.sh b/rules/compat/ln_s.sh
new file mode 100755
index 00000000..4d6cbf88
--- /dev/null
+++ b/rules/compat/ln_s.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+variant=$1
+
+OUTFILE=base.l${variant}_s.part
+
+> $OUTFILE
+
+awk '{ 
+  printf "  %s		=	+%s%%(v['${variant}']):'${variant}'\n", $1, $2; 
+}' < layoutRename.lst >> $OUTFILE