Getting closer to fixing /etc/fonts hard-coding.

diff --git a/configure.in b/configure.in
index d06058a293ac655d3e3469214acf9a096b4384db..3453bae131ebf4bb8e3bb9cf015809f5d7653db4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -363,7 +363,6 @@ fc-cache/Makefile
 fc-list/Makefile
 doc/Makefile
 doc/version.sgml
-doc/confdir.sgml
 test/Makefile
 fontconfig.spec
 fontconfig.pc

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f5018103bda017e202a5ee912ce1ef02cf99b823..f22163a856dfc0c7f718e6588d37de51be995dd2 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -134,6 +134,10 @@ fontconfig-user.html: fontconfig-user.sgml version.sgml confdir.sgml
        $(DOC2HTML) -u fontconfig-user.sgml
 
 fontconfig-user.txt:  fontconfig-user.sgml version.sgml confdir.sgml
+
+confdir.sgml: confdir.sgml.in
+       sed "s,@SYSCONFDIR@,${sysconfdir}," < confdir.sgml.in > confdir.sgml
+
 else
 all-local:
 clean-local:

diff --git a/doc/confdir.sgml.in b/doc/confdir.sgml.in
new file mode 100644 (file)
index 0000000..1f891fd
--- /dev/null
+++ b/doc/confdir.sgml.in
@@ -0,0 +1,25 @@
+<!--  
+   $Id$
+  
+   Copyright © 2003 Keith Packard
+  
+   Permission to use, copy, modify, distribute, and sell this software and its
+   documentation for any purpose is hereby granted without fee, provided that
+   the above copyright notice appear in all copies and that both that
+   copyright notice and this permission notice appear in supporting
+   documentation, and that the name of Keith Packard not be used in
+   advertising or publicity pertaining to distribution of the software without
+   specific, written prior permission.  Keith Packard makes no
+   representations about the suitability of this software for any purpose.  It
+   is provided "as is" without express or implied warranty.
+  
+   KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+   INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+   EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+   CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+   DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+   TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+   PERFORMANCE OF THIS SOFTWARE.
+-->
+<!-- this is filled in at make time -->
+@SYSCONFDIR@/fonts