Add a bunch more consts to Xft and fontconfig apis

[fontconfig.git] / Imakefile

diff --git a/Imakefile b/Imakefile
index a1fe947bba6cacb227a02e60bc90257cc487f7e5..4861d46f5d08eb10f4f3760483234f0c6cf52102 100644 (file)
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/fontconfig/Imakefile,v 1.3 2002/05/21 17:08:41 keithp Exp $
+XCOMM $XFree86: xc/lib/fontconfig/Imakefile,v 1.5 2002/05/25 13:52:37 herrb Exp $
 
 #define IHaveSubdirs
 #define PassCDebugFlags
@@ -26,8 +26,21 @@ DependSubdirs($(SUBDIRS))
 MakeLintLibSubdirs($(LINTSUBDIRS))
 MakeLintSubdirs($(LINTSUBDIRS),install.ln,install.ln)
 
-InstallNonExecFileNoClobber(fonts.conf,$(FONTCONFIGDIR))
-InstallNonExecFileNoClobber(fonts.dtd,$(FONTCONFIGDIR))
+#ifndef InstallNamedTargetBackup
+#define InstallNamedTargetBackup(step,srcname,flags,dest,dstname)      @@\
+step:: srcname                                                         @@\
+       MakeDir($(DESTDIR)dest)                                         @@\
+       MoveToBakFile($(DESTDIR)dest/dstname)                           @@\
+       $(INSTALL) $(INSTALLFLAGS) flags srcname $(DESTDIR)dest/dstname
+#endif /* InstallNamedTargetBackup */
+
+#ifndef InstallNonExecFileBackup
+#define InstallNonExecFileBackup(file,dest)                            @@\
+InstallNamedTargetBackup(install,file,$(INSTDATFLAGS),dest,file)
+#endif /* InstallNonExecFileBackup */
+
+InstallNonExecFileBackup(fonts.conf,$(FONTCONFIGDIR))
+InstallNonExecFile(fonts.dtd,$(FONTCONFIGDIR))
 
 all:: fonts.conf
 
@@ -42,18 +55,18 @@ all:: fontconfig-config.script
 
 fontconfig-config.script: fontconfig-config.in
        RemoveFile($@)
-       sh config/config-subst $(SUBSTVARS) < $< > $@
+       sh config/config-subst $(SUBSTVARS) < fontconfig-config.in > $@
 
 InstallScript(fontconfig-config,$(BINDIR))
 
 clean::
        RemoveFile(fontconfig-config.script)
-       
+
 all:: fontconfig.pc
 
 fontconfig.pc: fontconfig.pc.in
        RemoveFile($@)
-       sh config/config-subst $(SUBSTVARS) < $< > $@
+       sh config/config-subst $(SUBSTVARS) < fontconfig.pc.in > $@
 
 InstallNonExecFile(fontconfig.pc,$(USRLIBDIR)/pkgconfig)