Use CONFDIR instead of SYSCONFDIR/fonts in manual. Use awk to strip

    trailing newline instead of leaving CVS file without a newline (which
    will break at some point)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f22163a856dfc0c7f718e6588d37de51be995dd2..6a9d782762e5e009f7c587fd72c9ec4720346a8c 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -135,8 +135,9 @@ fontconfig-user.html: fontconfig-user.sgml version.sgml confdir.sgml
 
 fontconfig-user.txt:  fontconfig-user.sgml version.sgml confdir.sgml
 
+STRIPNL=awk '{ if (NR > 1) printf ("\n"); printf ("%s", $$0); }'
 confdir.sgml: confdir.sgml.in
-       sed "s,@SYSCONFDIR@,${sysconfdir}," < confdir.sgml.in > confdir.sgml
+       sed "s,@CONFDIR\@,${CONFDIR}," < confdir.sgml.in | $(STRIPNL) > confdir.sgml
 
 else
 all-local:

diff --git a/doc/confdir.sgml.in b/doc/confdir.sgml.in
index 875c7dc14631ba75092502a3fee801bcfeb4c3a6..d190d0c9df1b17d059b46883dc078e65d421cf74 100644 (file)
--- a/doc/confdir.sgml.in
+++ b/doc/confdir.sgml.in
@@ -22,4 +22,4 @@
    PERFORMANCE OF THIS SOFTWARE.
 -->
 <!-- this is filled in at make time -->
-@SYSCONFDIR@/fonts
\ No newline at end of file
+@CONFDIR@