1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

fontaliases: use copy rather than symlink since bdftopcf can't handle those

bdftopcf specifically will not read symbolic links.  This causes it to
fail when creating the programs/fontaliases/*/C/dtinfo.pcf.Z file and
subsequently, the fonts.dir file.

So, we add a new Imake macro: CopySourceFile(), to copy rather than
symlink the dtinfo.bdf file so these operations can complete
successfully.  The dtinfo.bdf file is only 5KB, so there's very little
impact having an extra copy created during a build.
This commit is contained in:
Jon Trulson 2018-04-03 12:55:23 -06:00
parent 7f70748d65
commit 8f7c874ba0
3 changed files with 23 additions and 2 deletions

View file

@ -134,6 +134,7 @@ XCOMM rules: $TOG: Imake.rules /main/227 1998/02/02 12:07:57 kaleb $
* NormalLintTarget (srclist) * NormalLintTarget (srclist)
* LintTarget () * LintTarget ()
* LinkSourceFile (src,dir) * LinkSourceFile (src,dir)
* CopySourceFile (src,dir)
* LinkFile (tofile,fromfile) * LinkFile (tofile,fromfile)
* MakeSubincludesForBuild (step,dir,srclist) * MakeSubincludesForBuild (step,dir,srclist)
* LangNamedTargetSubdirs (lang,name,dirs,verb,flags,subname) * LangNamedTargetSubdirs (lang,name,dirs,verb,flags,subname)
@ -2075,6 +2076,26 @@ clean:: @@\
#endif #endif
/*
* CopySourceFile - snag source file from some other directory
*/
#ifndef CopySourceFile
#define CopySourceFile(src,dir) @@\
src: dir/src @@\
RemoveFile($@) @@\
$(CP) $? $@ @@\
@@\
NoConfigRec(src) @@\
@@\
includes:: src @@\
@@\
depend:: src @@\
@@\
clean:: @@\
RemoveFile(src)
#endif
/* /*
* LinkFile - link a file * LinkFile - link a file
*/ */

View file

@ -7,7 +7,7 @@ MKFONTDIR = $(XPROJECTROOT)/bin/mkfontdir
OBJS = FontObj(dtinfo) OBJS = FontObj(dtinfo)
LinkSourceFile(dtinfo.bdf,$(CDESRC)/fontaliases/bdf) CopySourceFile(dtinfo.bdf,$(CDESRC)/fontaliases/bdf)
MakeFonts() MakeFonts()

View file

@ -6,7 +6,7 @@ XCOMM $XConsortium: fonts.tmpl /main/2 1996/09/13 17:55:52 drk $
OBJS = FontObj(dtinfo) $(LOCAL_OBJS) OBJS = FontObj(dtinfo) $(LOCAL_OBJS)
LinkSourceFile(dtinfo.bdf,$(CDESRC)/fontaliases/bdf) CopySourceFile(dtinfo.bdf,$(CDESRC)/fontaliases/bdf)
MakeFonts() MakeFonts()