diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-24 17:17:28 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-24 17:17:28 +0000 |
| commit | d096790334f8f55d92ee5ffbdf89c212e349d0e8 (patch) | |
| tree | 67ae155d4e0b1eb5d3a5c25763304846ea691811 | |
| parent | 6ae8ba564179ed103af3dc14ce52da487474e879 (diff) | |
Do not assume that merge.sh has the 'x' bit set.
| -rw-r--r-- | data/xkeyboard-config/rules/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/xkeyboard-config/rules/Makefile b/data/xkeyboard-config/rules/Makefile index e923884db..163ba86d1 100644 --- a/data/xkeyboard-config/rules/Makefile +++ b/data/xkeyboard-config/rules/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2011/10/16 17:18:56 shadchin Exp $ +# $OpenBSD: Makefile,v 1.7 2012/06/24 17:17:27 matthieu Exp $ SUBDIR= compat @@ -49,7 +49,7 @@ all: depend ${BASE_RULES} _SUBDIRUSE depend: _SUBDIRUSE base: ${BASE_PARTS} - HDR="${XKB_DIR}/${XKB_SUBDIR}/HDR" ${XKB_DIR}/${XKB_SUBDIR}/merge.sh $@ ${BASE_PARTS} + HDR="${XKB_DIR}/${XKB_SUBDIR}/HDR" ${SHELL} ${XKB_DIR}/${XKB_SUBDIR}/merge.sh $@ ${BASE_PARTS} base.lst: base.xml perl ${XKB_DIR}/${XKB_SUBDIR}/xml2lst.pl < base.xml > $@ |