diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-04 15:38:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-04 15:38:04 +0000 |
| commit | 3592ad31cfc72ffff3c9024eecea7d3b987c7954 (patch) | |
| tree | 0e3b50cb6bcd0839b591d318a41d04b7cbd8e6e2 /xorg-server/xkeyboard-config/symbols/makefile | |
| parent | 79409465b0b8d5d38e6b94deb1943316f40c66eb (diff) | |
| parent | 0a5888393c68f6f7db86206d1f277232db18240b (diff) | |
| download | vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.tar.gz vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.tar.bz2 vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols/makefile')
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/makefile b/xorg-server/xkeyboard-config/symbols/makefile index acbbdf182..522ea869c 100644 --- a/xorg-server/xkeyboard-config/symbols/makefile +++ b/xorg-server/xkeyboard-config/symbols/makefile @@ -1,4 +1,4 @@ -SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras +SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr ifeq ($(MAKESERVER),1) $(error Please do not specify MAKESERVER=1) @@ -8,9 +8,10 @@ THISDIR=symbols DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR) -dist_xkbdata_symbols_DATA = \ +dist_symbols_DATA = \ ad af al \ -am ara at az \ +am apl ara \ +at az \ ba bd be \ bg br brai \ bt bw by \ @@ -42,10 +43,14 @@ za \ altwin capslock compose ctrl empty eurosign rupeesign group inet \ keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo -DATA_FILES=$(dist_xkbdata_symbols_DATA:%=$(DESTDIR)\%) +DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%) load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);) extrastuff: $(SUBDIRS:%=%\all) include ..\xkbrules.mak + +$(DESTDIR)\cd: cd.in + copy $< $@ + |