From f946755cdb0b0db08debc9f0ee1c2d4f62b484a1 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 23 Apr 2003 04:05:58 +0000 Subject: [PATCH] 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) --- doc/Makefile.am | 3 ++- doc/confdir.sgml.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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. --> -@SYSCONFDIR@/fonts \ No newline at end of file +@CONFDIR@ -- 2.39.2