diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-23 10:05:55 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-23 10:05:55 +0100 |
| commit | 0f834b91a4768673833ab4917e87d86c237bb1a6 (patch) | |
| tree | 363489504ed4b2d360259b8de4c9e392918e5d02 /fontconfig/conf.d | |
| parent | fc72edebf875378459368c5383d9023730cbca54 (diff) | |
| download | vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.tar.gz vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.tar.bz2 vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.zip | |
libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update
23 Mar 2012
Diffstat (limited to 'fontconfig/conf.d')
| -rw-r--r-- | fontconfig/conf.d/40-nonlatin.conf | 8 | ||||
| -rw-r--r-- | fontconfig/conf.d/Makefile.am | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/fontconfig/conf.d/40-nonlatin.conf b/fontconfig/conf.d/40-nonlatin.conf index 1208a6ebf..c900fd4e7 100644 --- a/fontconfig/conf.d/40-nonlatin.conf +++ b/fontconfig/conf.d/40-nonlatin.conf @@ -89,6 +89,10 @@ <family>FreeSerif</family> <default><family>serif</family></default> </alias> + <alias> + <family>SimSun</family> + <default><family>serif</family></default> + </alias> <!-- Sans-serif faces --> @@ -153,10 +157,6 @@ <default><family>sans-serif</family></default> </alias> <alias> - <family>SimSun</family> - <default><family>sans-serif</family></default> - </alias> - <alias> <family>MgOpen Modata</family> <default><family>sans-serif</family></default> </alias> diff --git a/fontconfig/conf.d/Makefile.am b/fontconfig/conf.d/Makefile.am index d122a8ff0..13f243bb3 100644 --- a/fontconfig/conf.d/Makefile.am +++ b/fontconfig/conf.d/Makefile.am @@ -86,14 +86,14 @@ install-data-local: @(echo cd ${DESTDIR}${confddir}; \ cd ${DESTDIR}${confddir}; \ for i in ${CONF_LINKS}; do \ - rm -f $$i; \ - echo rm -f $$i";" ln -s ../conf.avail/$$i .; \ + $(RM) $$i; \ + echo $(RM) $$i";" ln -s ../conf.avail/$$i .; \ ln -s ../conf.avail/$$i .; \ done) uninstall-local: @(echo cd ${DESTDIR}${confddir}; \ cd ${DESTDIR}${confddir}; \ for i in ${CONF_LINKS}; do \ - echo rm -f $$i; \ - rm -f $$i; \ + echo $(RM) $$i; \ + $(RM) $$i; \ done) |