summaryrefslogtreecommitdiff
path: root/X11.tmpl
diff options
context:
space:
mode:
Diffstat (limited to 'X11.tmpl')
-rw-r--r--X11.tmpl11
1 files changed, 8 insertions, 3 deletions
diff --git a/X11.tmpl b/X11.tmpl
index 2130f7f..1ee5e68 100644
--- a/X11.tmpl
+++ b/X11.tmpl
@@ -6,7 +6,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
-XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.247 2004/02/10 10:38:56 alanh Exp $
+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
/***************************************************************************
* *
@@ -3744,8 +3744,13 @@ clean:: @@\
# if !CrossCompiling || UseInstalledOnCrossCompile
# define InstallFontsDir(dest) @@\
install:: @@\
- RemoveFile($(DESTDIR)dest/fonts.scale) @@\
- RunProgram(MKFONTSCALE, $(DESTDIR)dest) @@\
+ MakeDir($(DESTDIR)dest) @@\
+ @if [ X$(STATIC_FONTS_SCALE) = X ]; then (set -x; \ @@\
+ RemoveFile($(DESTDIR)dest/fonts.scale); \ @@\
+ RunProgram(MKFONTSCALE, $(DESTDIR)dest)); \ @@\
+ else (set -x; \ @@\
+ InstallInline(fonts.scale,$(INSTDATFLAGS),dest)); \ @@\
+ fi @@\
RemoveFile($(DESTDIR)dest/fonts.dir) @@\
RunProgram(MKFONTDIR, $(MKFONTDIROPTS) $(DESTDIR)dest)
# else