selinux-apache Makefile,1.1,1.2 selinux-apache-en.xml,1.24,1.25

Author: pfrields

Update of /cvs/docs/selinux-apache
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19271

Modified Files:
	Makefile selinux-apache-en.xml 
Log Message:
Updated entity file references and Makefile


Index: Makefile
===================================================================
RCS file: /cvs/docs/selinux-apache/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	11 Nov 2004 19:13:12 -0000	1.1
+++ Makefile	28 Jun 2005 22:14:42 -0000	1.2
@@ -7,18 +7,20 @@
 # Copyright 2003 Tammy Fox, Red Hat, Inc.
 ###############################################################################
 
-XSLPDF         = ../xsl/main-pdf.xsl
-XSLHTML        = ../xsl/main-html.xsl
+XSLPDF         = ../docs-common/xsl/main-pdf.xsl
+XSLHTML        = ../docs-common/xsl/main-html.xsl
 LANG	       = en
 DOCNAME        = selinux-apache-$(LANG)
 XMLFILE        = $(DOCNAME).xml
 
 ######################################################
+include ../docs-common/Makefile.common
+######################################################
 html: 
 	@xmlto html -x $(XSLHTML) -o $(DOCNAME) $(XMLFILE)
 	@mkdir -p $(DOCNAME)/stylesheet-images
-	@cp ../stylesheet-images/*.png $(DOCNAME)/stylesheet-images
-	@cp ../css/fedora.css $(DOCNAME)
+	@cp ../docs-common/stylesheet-images/*.png $(DOCNAME)/stylesheet-images
+	@cp ../docs-common/css/fedora.css $(DOCNAME)
 
 
 pdf:
@@ -26,4 +28,4 @@
 ######################################################
 
 clean: 
-	@rm -rfv *.html *.pdf *.tex $(DOCNAME)
+	@rm -rfv *.html *.pdf *.tex $(DOCNAME) $(DOCNAME).tar.gz


Index: selinux-apache-en.xml
===================================================================
RCS file: /cvs/docs/selinux-apache/selinux-apache-en.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- selinux-apache-en.xml	18 Nov 2004 19:18:59 -0000	1.24
+++ selinux-apache-en.xml	28 Jun 2005 22:14:42 -0000	1.25
@@ -3,7 +3,7 @@
  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
 <!-- *************** Bring in Fedora entities *************** -->
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../common/fedora-entities-en.xml">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM
"../docs-common/common/fedora-entities-en.ent">
 %FEDORA-ENTITIES-EN;
 
 <!ENTITY BOOKID "selinux-apache-0.6 (2004-11-16-T21:30-0500)"> <!--
version of manual and date -->