summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2004-08-29 21:06:00 +0000
committerKevin E Martin <kem@kem.org>2004-08-29 21:06:00 +0000
commit0476eaa22eae191c8ccd99eced9041f77e579f0b (patch)
treed1f55b85bfe60f2bdfcb7c6055bd3b9e9cdae7dd
parent1b8ef3efedb0b340397ed41106713f1bc1a603f2 (diff)
Fix make install when BuildServersOnly is YES (Bug #1213).
Fix build failures when UseDeprecatedKeyboardDriver is YES and DoLoadableServer is NO (Bug #1229, Kristian Høgsberg). Fix failure when using DLL loader and LD_BIND_NOW is set (Bug #1212, Adam Jackson).
-rw-r--r--X11.tmpl6
1 files changed, 5 insertions, 1 deletions
diff --git a/X11.tmpl b/X11.tmpl
index 4fb28ef..0823c97 100644
--- a/X11.tmpl
+++ b/X11.tmpl
@@ -1,6 +1,6 @@
XCOMM ----------------------------------------------------------------------
XCOMM X Window System Build Parameters and Rules
-XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.30 2004/08/27 13:26:22 eich Exp $
+XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.31 2004/08/27 22:47:44 eich Exp $
XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
XCOMM
XCOMM
@@ -4317,9 +4317,13 @@ install:: @@\
* InstallXpPMFFontsDir - make and install a fonts.dir index for model-config fonts
*/
#ifndef InstallXpPMFFontsDir
+#if BuildServersOnly
+#define InstallXpPMFFontsDir(destmodelfontdir) /**/
+#else
#define InstallXpPMFFontsDir(destmodelfontdir) @@\
install:: @@\
($(MKFONTSCALE) -b -s -l $(DESTDIR)destmodelfontdir)
+#endif
#endif /* InstallXpPMFFontsDir */