[Openhpi-svn] SF.net SVN: openhpi: [6616] openhpi/branches/2.10.x

[<re...@us...>]

Revision: 6616
          http://openhpi.svn.sourceforge.net/openhpi/?rev=6616&view=rev
Author:   renierm
Date:     2007-12-04 20:15:15 -0800 (Tue, 04 Dec 2007)

Log Message:
-----------
#1831717 Fixing bugs in the makefiles and specfile. Primarily, getting 'make rpm' to work again

Modified Paths:
--------------
    openhpi/branches/2.10.x/Makefile.am
    openhpi/branches/2.10.x/docs/hld/Makefile.am
    openhpi/branches/2.10.x/openhpi.spec.in

Modified: openhpi/branches/2.10.x/Makefile.am
===================================================================
--- openhpi/branches/2.10.x/Makefile.am	2007-12-05 03:48:06 UTC (rev 6615)
+++ openhpi/branches/2.10.x/Makefile.am	2007-12-05 04:15:15 UTC (rev 6616)
@@ -98,7 +98,7 @@
                   $(top_srcdir)/utils/el_utils.h
 
 docsdir=$(datadir)/doc/$(PACKAGE_NAME)-$(VERSION)
-docs_DATA = README README.daemon
+docs_DATA = README README.daemon COPYING
 
 $(top_srcdir)/utils/sahpi_enum_utils.h:
 	make -C $(top_builddir)/utils sahpi_enum_utils.h

Modified: openhpi/branches/2.10.x/docs/hld/Makefile.am
===================================================================
--- openhpi/branches/2.10.x/docs/hld/Makefile.am	2007-12-05 03:48:06 UTC (rev 6615)
+++ openhpi/branches/2.10.x/docs/hld/Makefile.am	2007-12-05 04:15:15 UTC (rev 6616)
@@ -36,10 +36,14 @@
 
 MAINTAINERCLEANFILES 	= Makefile.in  
 
-openhpi_docsdir		= $(datadir)/openhpi/docs/hld
+openhpi_docsdir		= $(datadir)/doc/$(PACKAGE_NAME)-$(VERSION)
 
-#openhpi_docs_DATA	= openhpi-manual/book1.html 
+openhpi_docs_DATA	= openhpi-manual/*.html
 
+openhpi_imgdir		= $(datadir)/doc/$(PACKAGE_NAME)-$(VERSION)/images
+
+openhpi_img_DATA	= openhpi-manual/images/*
+
 SGML_FILES              = $(shell echo $(srcdir)/*.dtd) $(shell echo $(srcdir)/*.sgml)
 
 EXTRA_DIST		= $(DIAGRAMS) $(SGML_FILES) htmlfilter.pl
@@ -57,7 +61,11 @@
 	-mkdir -p openhpi-manual/images
 	-cp $(DIAGRAMS) openhpi-manual/images
 
-publish-local: clean-local openhpi-manual/book1.html
+openhpi-manual/*.html: publish-local
+
+openhpi-manual/images/*: publish-local
+
+publish-local: openhpi-manual/book1.html
 	-./htmlfilter.pl $(shell echo $(srcdir)/openhpi-manual/*html)
 	-chmod a+x $(shell echo $(srcdir)/openhpi-manual/*html)
 	if test ! -e openhpi-manual/book1.html; then \

Modified: openhpi/branches/2.10.x/openhpi.spec.in
===================================================================
--- openhpi/branches/2.10.x/openhpi.spec.in	2007-12-05 03:48:06 UTC (rev 6615)
+++ openhpi/branches/2.10.x/openhpi.spec.in	2007-12-05 04:15:15 UTC (rev 6616)
@@ -6,6 +6,7 @@
 %define _sourcedir %{_topdir}
 %define _specdir %{_topdir}
 %define _srcrpmdir %{_rpmtopdir}/SRPMS
+%define _docdir %{_datadir}/doc/%{name}-%{version}
 
 %define with_ipmi @WITH_IPMI@
 %define with_bladecenter @WITH_SNMP_BC@
@@ -29,11 +30,11 @@
 Source: http://prdownloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
 #
 Buildroot: %{_rpmtopdir}/INSTALL
-BuildRequires: pkgconfig glib2-devel automake autoconf libtool net-snmp-devel gcc-c++ docbook-utils docbook-utils-pdf
+BuildRequires: pkgconfig glib2-devel automake autoconf libtool net-snmp-devel gcc-c++ docbook-utils
 %if 0%{?suse_version}
 BuildRequires: tcpd-devel
 %else
-BuildRequires: tcp_wrappers
+BuildRequires: tcp_wrappers docbook-utils-pdf
 %endif
 Requires: e2fsprogs-devel openssl-devel libstdc++-devel glib2-devel
 
@@ -160,8 +161,7 @@
 ./configure @ac_configure_args@ --sysconfdir=/etc --prefix=/usr --libdir=/usr/lib --with-varpath=/var/lib/%{name}
 %endif
 %{__make}
-make -C docs/hld pdf-am
-make -C docs/hld openhpi-manual/book1.html
+make -C docs/hld publish-local
 
 ###################################################
 %install
@@ -176,9 +176,14 @@
 %files
 ###################################################
 %defattr(-,root,root)
-%doc README README.daemon COPYING
-%doc docs/hld/*pdf
-%doc docs/hld/openhpi-manual
+%{_docdir}/README*
+%{_docdir}/COPYING
+%{_docdir}/*.html
+%dir %{_docdir}/images
+%{_docdir}/images/*.png
+%{_docdir}/images/*.gif
+#%doc README README.daemon COPYING
+#%doc docs/hld/openhpi-manual
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/%{name}.conf
 %dir %{_libdir}/%{name}
@@ -186,6 +191,7 @@
 %{_libdir}/libopenhpi*.so.*
 %{_libdir}/liboh*connx*.so.*
 %{_mandir}/man7/%{name}.7*
+%{_mandir}/man8/%{name}d.8*
 %{_sbindir}/openhpid
 %{_sysconfdir}/init.d/openhpid
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.