diff options
author | marha <marha@users.sourceforge.net> | 2010-02-28 16:19:32 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-02-28 16:19:32 +0000 |
commit | 6f73cad956de465042319277551264829856faa2 (patch) | |
tree | ab9750afe0e6b7451396296ce5793986061cad05 /xorg-server/fonts.src/misc | |
parent | 61b8b4249d504d00ad88444e49dfb835737e7ed9 (diff) | |
parent | 03ca670131e8e32c2aad3e5718dcebf37925072a (diff) | |
download | vcxsrv-6f73cad956de465042319277551264829856faa2.tar.gz vcxsrv-6f73cad956de465042319277551264829856faa2.tar.bz2 vcxsrv-6f73cad956de465042319277551264829856faa2.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/fonts.src/misc')
-rw-r--r-- | xorg-server/fonts.src/misc/makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/fonts.src/misc/makefile b/xorg-server/fonts.src/misc/makefile index 290ae173a..1ac7d367a 100644 --- a/xorg-server/fonts.src/misc/makefile +++ b/xorg-server/fonts.src/misc/makefile @@ -321,7 +321,7 @@ font_DATA = \ $(KOI8_R_PCF_FILES) \ $(JISX0201_PCF_FILES) -all: $(DESTDIR) $(UCS2ANY) $(DESTDIR)\fonts.scale $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias +all: $(DESTDIR) $(UCS2ANY) $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe @@ -331,7 +331,7 @@ $(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE) del -e $@ cd $(DESTDIR) & $(MKFONTSCALE) . -$(DESTDIR)\fonts.dir: $(font_DATA) $(MKFONTSCALE) +$(DESTDIR)\fonts.dir: $(DESTDIR)\fonts.scale $(font_DATA) $(MKFONTSCALE) del -e $@ cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l . |