[Commit] fontconfig/doc Makefile.am,1.12,1.13 confdir.sgml.in,1.2,1.3

[commit@keithp.com]

Committed by: keithp

Update of /local/src/CVS/fontconfig/doc
In directory home.keithp.com:/tmp/cvs-serv11926

Modified Files:
	Makefile.am confdir.sgml.in 
Log Message:
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)


Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/fontconfig/doc/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am	23 Apr 2003 00:08:03 -0000	1.12
+++ Makefile.am	23 Apr 2003 04:05:58 -0000	1.13
@@ -135,8 +135,9 @@
 
 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:

Index: confdir.sgml.in
===================================================================
RCS file: /local/src/CVS/fontconfig/doc/confdir.sgml.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- confdir.sgml.in	23 Apr 2003 00:40:24 -0000	1.2
+++ confdir.sgml.in	23 Apr 2003 04:05:58 -0000	1.3
@@ -22,4 +22,4 @@
    PERFORMANCE OF THIS SOFTWARE.
 -->
 <!-- this is filled in at make time -->
-@SYSCONFDIR@/fonts
\ No newline at end of file
+@CONFDIR@