Move the techdoc to the apparmor-parser package.

docs/Makefile

@@ -43,7 +43,7 @@ PAPERS=$(wildcard papers/*)
 # All manpages are now autotragically generated.
 GENERATED=${MANPAGES} ${HTMLMANPAGES}
 
-all: $(GENERATED)
+all: $(GENERATED) techdoc.pdf
 
 help:
 	@echo "This makefile is for creating a releases only."
@@ -54,6 +54,9 @@ techdoc.pdf: techdoc.tex
 	      grep -q "Label(s) may have changed" techdoc.log; \
 	do :; done
 
+%.txt: %.pdf
+	pdftotext $<
+
 techdoc/index.html: techdoc.pdf
 	latex2html -show_section_numbers -split 0 -noinfo -nonavigation -noaddress techdoc.tex
 
@@ -65,14 +68,6 @@ clean:
 	-rm -f $(GENERATED) $(TARBALL) $(NAME)-$(VERSION)*.tar.gz Make.rules pod2*.tmp techdoc.{aux,log,pdf,toc}
 	-rm -rf techdoc/
 
-.PHONY: install_manpages
-install_manpages: $(MANPAGES)
-	for dir in ${MANDIRS} ; do install -d ${DESTDIR}/${MANDIR}/man$${dir} ; done
-	$(foreach dir, ${MANDIRS}, \
-	     install -m 644 $(filter %.${dir}, ${MANPAGES}) ${DESTDIR}/${MANDIR}/man${dir}; \
-	     $(foreach aa_page, $(filter %.${dir}, ${AA_MANPAGES}), \
-	     	ln -sf $(aa_page) ${DESTDIR}/${MANDIR}/man${dir}/${aa_page:%=aa-%};)) 
-
 .PHONY: install_documents
 install_documents: ${HTMLMANPAGES}
 	mkdir -m 755 -p ${DESTDIR}/${DOCDIR}

parser/Makefile

@@ -111,7 +111,18 @@ export Q VERBOSE BUILD_OUTPUT
 po/${NAME}.pot: ${SRCS} ${HDRS}
 	make -C po ${NAME}.pot NAME=${NAME} SOURCES="${SRCS} ${HDRS}"
 
-all: 	$(LEX_C_FILES) $(YACC_C_FILES) $(TOOLS) $(MANPAGES) ${HTMLMANPAGES}
+techdoc.pdf: techdoc.tex
+	while pdflatex $< || exit 1; \
+		grep -q "Label(s) may have changed" techdoc.log; \
+	do :; done
+
+techdoc/index.html: techdoc.pdf
+	latex2html -show_section_numbers -split 0 -noinfo -nonavigation -noaddress techdoc.tex
+
+techdoc.txt: techdoc/index.html
+	w3m -dump $< > $@
+
+all: 	$(TOOLS) $(MANPAGES) ${HTMLMANPAGES} techdoc.pdf techdoc/index.html
 	$(Q)make -C po all
 	$(Q)make -s tests
 
@@ -248,6 +259,7 @@ clean: _clean
 	rm -f parser_version.h
 	rm -f $(NAME)*.tar.gz $(NAME)*.tgz
 	rm -f libstdc++.a
+	-rm -rf techdoc.{aux,log,pdf,toc,txt} techdoc/
 	make -s -C $(PCREDIR) clean
 	make -s -C $(AAREDIR) clean
 	make -s -C po clean

parser/apparmor-parser.spec.in

@@ -54,7 +54,7 @@ Provides: subdomain-parser-demo subdomain-parser-common subdomain-leaf-cert
 Provides: libimnxcert
 Provides: apparmor-docs
 %define apparmor_bin_prefix /lib/apparmor
-BuildRequires: bison flex
+BuildRequires: bison flex te_latex latex2html
 
 %description
 AppArmor Parser is a userlevel program that is used to load in program
@@ -99,6 +99,7 @@ make install DESTDIR=${RPM_BUILD_ROOT} \
 %{_mandir}/man*/*
 %doc *.[1-9].html
 %doc common/apparmor.css
+%doc techdoc.pdf techdoc/techdoc.html techdoc/techdoc.css
 
 %pre
 %if %{distro} == "redhat" || %{distro} == "rhel4"
@@ -156,6 +157,8 @@ fi
 %endif
 
 %changelog
+* Wed Apr 11 2007 - sbeattie@suse.de
+- Include techdoc in package
 * Wed Apr  4 2007 - sbeattie@suse.de
 - rcapparmor: fix dpkg ignore check
 - rcapparmor: support apparmor built into kernel