diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-24 18:07:33 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-24 18:07:33 +0000 |
| commit | a16c0d6f73877af35ea0519917a82d5919e3c304 (patch) | |
| tree | b575998554afa00acc1086ff0a5ef17785c75326 /xorg-server/xkbdata.src/rules/merge.sh | |
| parent | 0489d8cc5cc2f0bbdbee7aa2ed771ca0d42f30aa (diff) | |
| parent | ea63f0fae5c393ccf198aad0ae4dbda6d2a4391a (diff) | |
| download | vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.tar.gz vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.tar.bz2 vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/rules/merge.sh')
| -rw-r--r-- | xorg-server/xkbdata.src/rules/merge.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xorg-server/xkbdata.src/rules/merge.sh b/xorg-server/xkbdata.src/rules/merge.sh index 8dfde5546..b18af7c3d 100644 --- a/xorg-server/xkbdata.src/rules/merge.sh +++ b/xorg-server/xkbdata.src/rules/merge.sh @@ -1,5 +1,6 @@ -#!/bin/bash +#!/bin/sh +INDIR=`dirname $0` DEST=$1 shift @@ -11,12 +12,14 @@ basename=`basename $0` echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST for i in $*; do - if [ "$i" == "$HDR" ] || [ "$i" == "HDR" ]; then + if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then echo >> $DEST; read hdr echo "$hdr" >> $DEST + elif test -f $i; then + cat $i >> $DEST || exit 1 else - cat $i >> $DEST; + cat $INDIR/$i >> $DEST || exit 1 fi done < $HDR |