[xorg-commit-diffs] xc/programs/fc-cache Imakefile,1.1.4.1,1.1.4.2

Egbert Eich xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:17:39 PDT 2004


Committed by: eich

Update of /cvs/xorg/xc/programs/fc-cache
In directory pdx:/home/eich/tstbuild/xc/programs/fc-cache

Modified Files:
      Tag: XORG-CURRENT
	Imakefile 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/fc-cache/Imakefile,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Imakefile	5 Mar 2004 13:41:13 -0000	1.1.4.1
+++ b/Imakefile	15 Apr 2004 10:17:35 -0000	1.1.4.2
@@ -10,13 +10,22 @@
 SRCS=fc-cache.c
 OBJS=fc-cache.o
 
+#if !InstallFontconfigLibrary
+#undef InstallProgram
+#define InstallProgram(x,y)
+#undef InstallManPage
+#define InstallManPage(x,y)
+#endif
+
 ComplexProgramTarget(fc-cache)
 LinkBuildBinary(ProgramTargetName(fc-cache))
 
+#if InstallFontconfigLibrary
 install::
 	if [ x$${DESTDIR} = x ]; then \
 		$(FCCACHE) -v -f;\
 	fi
+#endif
 
 LinkSourceFile(fc-cache.c,$(FONTCONFIGDIR)/fc-cache)
 LinkSourceFile(fc-cache.man,$(FONTCONFIGDIR)/fc-cache)




More information about the xorg-commit-diffs mailing list