build fixes for selinux-doc-1.18

build fixes for selinux-doc-1.18

[Andreas Steinmetz]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

1. added simple top level Makefile
2. replaced db2html with docbook2html as db2html is not part of
   docbook-utils but seems to be created by some distro only
-- 
Andreas Steinmetz                       SPAMmers use robotrap@domdv.de

[-- Attachment #2: selinux-doc-1.18.diff --]
[-- Type: text/plain, Size: 1459 bytes --]

diff -rNu selinux-doc-1.18.orig/Makefile selinux-doc-1.18/Makefile
--- selinux-doc-1.18.orig/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ selinux-doc-1.18/Makefile	2005-04-04 00:12:35.000000000 +0200
@@ -0,0 +1,4 @@
+subdirs=module uavc policy
+
+all:
+	for i in $(subdirs) ; do make -C $$i || exit 1 ; done
diff -rNu selinux-doc-1.18.orig/module/Makefile selinux-doc-1.18/module/Makefile
--- selinux-doc-1.18.orig/module/Makefile	2004-02-26 21:36:44.000000000 +0100
+++ selinux-doc-1.18/module/Makefile	2005-04-04 00:05:49.000000000 +0200
@@ -20,7 +20,7 @@
 
 $(HTML): $(ALL)
 	-$(RM) -r $@
-	db2html $(TOP)
+	docbook2html $(TOP)
 	if [ ! -z "$(JPG-$@)" ]; then cp $(JPG-$@) $@; fi
 
 clean:
diff -rNu selinux-doc-1.18.orig/policy/Makefile selinux-doc-1.18/policy/Makefile
--- selinux-doc-1.18.orig/policy/Makefile	2004-02-26 21:36:47.000000000 +0100
+++ selinux-doc-1.18/policy/Makefile	2005-04-04 00:05:58.000000000 +0200
@@ -20,7 +20,7 @@
 
 $(HTML): $(ALL)
 	-$(RM) -r $@
-	db2html $(TOP)
+	docbook2html $(TOP)
 	if [ ! -z "$(JPG-$@)" ]; then cp $(JPG-$@) $@; fi
 
 clean:
diff -rNu selinux-doc-1.18.orig/uavc/Makefile selinux-doc-1.18/uavc/Makefile
--- selinux-doc-1.18.orig/uavc/Makefile	2004-05-29 01:57:26.000000000 +0200
+++ selinux-doc-1.18/uavc/Makefile	2005-04-04 00:06:06.000000000 +0200
@@ -20,7 +20,7 @@
 
 $(HTML): $(ALL)
 	-$(RM) -r $@
-	db2html $(TOP)
+	docbook2html $(TOP)
 	if [ ! -z "$(JPG-$@)" ]; then cp $(JPG-$@) $@; fi
 
 clean:

Re: build fixes for selinux-doc-1.18

[Stephen Smalley]

On Mon, 2005-04-04 at 14:06 +0200, Andreas Steinmetz wrote:
> 1. added simple top level Makefile
> 2. replaced db2html with docbook2html as db2html is not part of
>    docbook-utils but seems to be created by some distro only

Hmmm...well, db2html appears to create a separate directory for the
output files, and copies stylesheet images into it as well.  The use of
db2html was patterned after its use in the kernel
Documentation/DocBook/Makefile.  Hence, I'm hesitant to merge the latter
change without further justification.

-- 
Stephen Smalley <sds@tycho.nsa.gov>
National Security Agency


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: build fixes for selinux-doc-1.18

[Stephen Smalley]

On Tue, 2005-04-05 at 20:06 +0200, Andreas Steinmetz wrote:
> Stephen Smalley wrote:
> > Hmmm...well, db2html appears to create a separate directory for the
> > output files, and copies stylesheet images into it as well.  The use of
> > db2html was patterned after its use in the kernel
> > Documentation/DocBook/Makefile.  Hence, I'm hesitant to merge the latter
> > change without further justification.
> 
> I see. Would you accept a patch that uses db2html if available and
> docbook2html otherwise? If so I can come up with this probably on
> thursday, maybe friday.

Wouldn't it just be easier to add db2html to the distribution?  It
appears to be a trivial script (not quite as trivial as docbook2html,
but still quite simple), and the kernel DocBook Makefile seems to rely
on it without anyone complaining about that.  Falling back to
docbook2html yields a different result (i.e. no separate directory for
the output), so it wouldn't work anyway for the spec file.

-- 
Stephen Smalley <sds@tycho.nsa.gov>
National Security Agency


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: build fixes for selinux-doc-1.18

[Andreas Steinmetz]

Stephen Smalley wrote:
> Hmmm...well, db2html appears to create a separate directory for the
> output files, and copies stylesheet images into it as well.  The use of
> db2html was patterned after its use in the kernel
> Documentation/DocBook/Makefile.  Hence, I'm hesitant to merge the latter
> change without further justification.

I see. Would you accept a patch that uses db2html if available and
docbook2html otherwise? If so I can come up with this probably on
thursday, maybe friday.

-- 
Andreas Steinmetz                       SPAMmers use robotrap@domdv.de

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: build fixes for selinux-doc-1.18

[Andreas Steinmetz]

Stephen Smalley wrote:
> Wouldn't it just be easier to add db2html to the distribution?  It

Fine with me.

-- 
Andreas Steinmetz                       SPAMmers use robotrap@domdv.de

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: build fixes for selinux-doc-1.18

[Stephen Smalley]

On Tue, 2005-04-05 at 20:24 +0200, Andreas Steinmetz wrote:
> Stephen Smalley wrote:
> > Wouldn't it just be easier to add db2html to the distribution?  It
> 
> Fine with me.

By "distribution", I mean the Linux distribution you are using, not our
distribution of selinux-doc ;)

But I see that patches have been submitted on linux-kernel to change the
kernel DocBook Makefile to use xmlto rather than db2*.  Do you have
xmlto in your distro?  See http://marc.theaimsgroup.com/?l=linux-
kernel&m=111278927418714&w=2.  I haven't tried xmlto yet myself, so I
don't know what impact this has on the generated output.

-- 
Stephen Smalley <sds@tycho.nsa.gov>
National Security Agency


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: build fixes for selinux-doc-1.18

[Stephen Smalley]

On Wed, 2005-04-06 at 09:47 -0400, Stephen Smalley wrote:
> By "distribution", I mean the Linux distribution you are using, not our
> distribution of selinux-doc ;)
> 
> But I see that patches have been submitted on linux-kernel to change the
> kernel DocBook Makefile to use xmlto rather than db2*.  Do you have
> xmlto in your distro?  See http://marc.theaimsgroup.com/?l=linux-
> kernel&m=111278927418714&w=2.  I haven't tried xmlto yet myself, so I
> don't know what impact this has on the generated output.

Ah, just tried xmlto on one of the reports, and it didn't like it very
much.  Oh well.

-- 
Stephen Smalley <sds@tycho.nsa.gov>
National Security Agency


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.