From: Keith Packard <keithp@keithp.com>
Date: Wed, 23 Apr 2003 04:05:58 +0000 (+0000)
Subject: Use CONFDIR instead of SYSCONFDIR/fonts in manual. Use awk to strip
X-Git-Tag: fc-2_2_90~33
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f946755cdb0b0db08debc9f0ee1c2d4f62b484a1;p=fontconfig.git

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 f22163a..6a9d782 100644
--- 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 875c7dc..d190d0c 100644
--- 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@