aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules/compat
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/compat')
-rw-r--r--xorg-server/xkeyboard-config/rules/compat/makefile51
1 files changed, 27 insertions, 24 deletions
diff --git a/xorg-server/xkeyboard-config/rules/compat/makefile b/xorg-server/xkeyboard-config/rules/compat/makefile
index 832ef5f80..e14430c74 100644
--- a/xorg-server/xkeyboard-config/rules/compat/makefile
+++ b/xorg-server/xkeyboard-config/rules/compat/makefile
@@ -14,40 +14,43 @@ base.ml1_s.part \
base.mlv_s.part \
base.ml1v1_s.part
-
+# Here we make a distinction when compiling from cygwin or from cmd
+ifdef SHLVL
+SH=sh
+SHEXT=.sh
+else
SH=cmd /c
+SHEXT=.bat
+endif
-base.ml2_s.part: mln_s.bat $(transform_files)
- $(SH) $< 2
-
-base.ml3_s.part: mln_s.bat $(transform_files)
- $(SH) $< 3
+base.ml2_s.part: $(scripts_dir)\mln_s$(SHEXT) $(transform_files)
+ $(SH) $< 2 .
-base.ml4_s.part: mln_s.bat $(transform_files)
- $(SH) $< 4
+base.ml3_s.part: $(scripts_dir)\mln_s$(SHEXT) $(transform_files)
+ $(SH) $< 3 .
-base.ml2v2_s.part: mlnvn_s.bat $(transform_files)
- $(SH) $< 2
+base.ml4_s.part: $(scripts_dir)\mln_s$(SHEXT) $(transform_files)
+ $(SH) $< 4 .
-base.ml3v3_s.part: mlnvn_s.bat $(transform_files)
- $(SH) $< 3
+base.ml2v2_s.part: $(scripts_dir)\mlnvn_s$(SHEXT) $(transform_files)
+ $(SH) $< 2 .
-base.ml4v4_s.part: mlnvn_s.bat $(transform_files)
- $(SH) $< 4
+base.ml3v3_s.part: $(scripts_dir)\mlnvn_s$(SHEXT) $(transform_files)
+ $(SH) $< 3 .
-base.ml_s.part: ml_s.bat $(transform_files)
- $(SH) $<
+base.ml4v4_s.part: $(scripts_dir)\mlnvn_s$(SHEXT) $(transform_files)
+ $(SH) $< 4 .
-base.ml1_s.part: ml1_s.bat $(transform_files)
- $(SH) $<
+base.ml_s.part: $(scripts_dir)\ml_s$(SHEXT) $(transform_files)
+ $(SH) $< .
-base.mlv_s.part: mlv_s.bat $(transform_files)
- $(SH) $<
+base.ml1_s.part: $(scripts_dir)\ml1_s$(SHEXT) $(transform_files)
+ $(SH) $< .
-base.ml1v1_s.part: ml1v1_s.bat $(transform_files)
- $(SH) $<
+base.mlv_s.part: $(scripts_dir)\mlv_s$(SHEXT) $(transform_files)
+ $(SH) $< .
-%.bat: $(scripts_dir)\%.sh
- copy $< $@
+base.ml1v1_s.part: $(scripts_dir)\ml1v1_s$(SHEXT) $(transform_files)
+ $(SH) $< .
all: $(SCRIPTS)