diff options
| author | Egbert Eich <eich@suse.de> | 2004-08-27 13:26:22 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-08-27 13:26:22 +0000 |
| commit | 9e57311410f840fa235d03d24fd303e8fb319e19 (patch) | |
| tree | 928111990f7f9243bfb100327e9fd4a62b6b9985 | |
| parent | 97ef1ef17a506d911711cf1e1caeec9305373d6a (diff) | |
Fixed UseInstalled handling when cross compiling when building with
different ProjectRoot. Set X11ProjectRoot to the ProjectRoot on the
build host (where the binaries that run on the build host live)
(Alexander Gottwald).
| -rw-r--r-- | X11.rules | 8 | ||||
| -rw-r--r-- | X11.tmpl | 32 |
2 files changed, 25 insertions, 15 deletions
@@ -35,6 +35,14 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ # define ImportX11 NO #endif +#if defined(X11ProjectRoot) +# define XBinDir $(XPROJECTROOT)/bin +#elif defined(ProjectRoot) +# define XBinDir $(PROJECTROOT)/bin +#else +# define XBinDir $(BINDIR) +#endif + #ifdef X11ProjectRoot # define XUsrLibDirPath $(USRLIBDIR):$(XPROJECTROOT)/lib #else @@ -1,6 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.28 2004/08/19 16:28:42 kem Exp $ +XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.29 2004/08/25 00:30:41 kem Exp $ XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM @@ -1650,6 +1650,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules LIBEXECDIR = LibexecDir MODULEDIR = ModuleDir TOP_X_INCLUDES = TopXInclude + XBINDIR = XBinDir /* BINDIR for X11ProjectRoot */ INSTSRCDIR = InstSrcDir /* Installed source (kernel modules). */ @@ -1683,15 +1684,15 @@ XCOMM X Window System make variables; these need to be coordinated with rules INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */ #if UseInstalledX11 - RGB = $(BINDIR)/rgb - FONTC = $(BINDIR)/bdftopcf - MKFONTSCALE = $(BINDIR)/mkfontscale - MKFONTDIR = $(BINDIR)/mkfontdir - MKHTMLINDEX = $(BINDIR)/mkhtmlindex - UCS2ANY = $(BINDIR)/ProgramTargetName(ucs2any) - BDFTRUNCATE = $(BINDIR)/bdftruncate + RGB = $(XBINDIR)/rgb + FONTC = $(XBINDIR)/bdftopcf + MKFONTSCALE = $(XBINDIR)/mkfontscale + MKFONTDIR = $(XBINDIR)/mkfontdir + MKHTMLINDEX = $(XBINDIR)/mkhtmlindex + UCS2ANY = $(XBINDIR)/ProgramTargetName(ucs2any) + BDFTRUNCATE = $(XBINDIR)/bdftruncate UCSMAPPREFIX = $(FONTDIR)/util/map- - XCURSORGEN = $(BINDIR)/xcursorgen + XCURSORGEN = $(XBINDIR)/xcursorgen #else RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb # if !CrossCompiling @@ -1699,18 +1700,19 @@ XCOMM X Window System make variables; these need to be coordinated with rules MKFONTSCALE = $(CLIENTENVSETUP) $(PRELOADFREETYPESETUP) $(XBUILDBINDIR)/mkfontscale MKFONTDIR = $(MKFONTSCALE) -b -s -l XCURSORGEN = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/xcursorgen + UCS2ANY = $(XBUILDBINDIR)/ProgramTargetName(ucs2any) # elif UseInstalledOnCrossCompile - MKFONTDIR = $(BINDIR)/mkfontdir - MKFONTSCALE = $(BINDIR)/mkfontscale - FONTC = $(BINDIR)/bdftopcf - XCURSORGEN = $(BINDIR)/xcursorgen + MKFONTDIR = $(XBINDIR)/mkfontdir + MKFONTSCALE = $(XBINDIR)/mkfontscale + FONTC = $(XBINDIR)/bdftopcf + XCURSORGEN = $(XBINDIR)/xcursorgen + UCS2ANY = $(XBINDIR)/ucs2any # endif # if HasPerl MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,) # else MKHTMLINDEX = $(SHELL) $(CONFIGSRC)/util/mkhtmlindex.sh # endif - UCS2ANY = $(XBUILDBINDIR)/ProgramTargetName(ucs2any) BDFTRUNCATE = $(FONTSRC)/util/bdftruncate.pl UCSMAPPREFIX = $(FONTSRC)/util/map- #endif @@ -3797,7 +3799,7 @@ ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir) # endif # if defined(UseInstalled) || (CrossCompiling && UseInstalledOnCrossCompile) - XKBCOMPCMD = $(BINDIR)/XkbComp + XKBCOMPCMD = $(XBINDIR)/XkbComp # else XKBCOMPSRC = $(PROGRAMSRC)/XkbComp # if CrossCompiling |