Author: wyoung
Date: Mon Jul 2 21:41:09 2007
New Revision: 1644
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1644&view=rev
Log:
More fixes to RPM build with nodoc enabled
Modified:
trunk/ChangeLog
trunk/mysql++.bkl
trunk/mysql++.spec.in
Modified: trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/ChangeLog?rev=1644&r1=1643&r2=1644&view=diff
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Mon Jul 2 21:41:09 2007
@@ -1,4 +1,4 @@
-2.3.0, 2007.07.02 (r1643)
+2.3.0, 2007.07.02 (r1644)
o Added Query::for_each() and Query::store_if() methods
proposed by Joel Fielder, and added examples for each.
Modified: trunk/mysql++.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=1644&r1=1643&r2=1644&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Mon Jul 2 21:41:09 2007
@@ -286,13 +286,15 @@
mkdir -p doc/latex ; cd lib ; doxygen >
/dev/null
</command>
<command>
- cd doc/latex ; make ; cp refman.pdf ..
+ mkdir -p doc/pdf ; cd doc/latex ; make ; cp
*.pdf ../pdf
</command>
</action>
<action id="doc/html/userman/index.html">
<depends-on-file>doc/userman/userman.dbx</depends-on-file>
- <command>cd doc/userman ; make html pdf</command>
+ <command>
+ cd doc/userman ; make html pdf ; cp *.pdf ../pdf
+ </command>
</action>
<action id="doc">
@@ -330,7 +332,7 @@
<!-- doc subdir -->
<if cond="BUILDDOCS=='yes'">
<command>
- cp doc/README* doc/*.pdf
doc/ssqls-pretty $(PKGNAME)/doc
+ cp -r doc/README* doc/pdf
doc/ssqls-pretty $(PKGNAME)/doc
</command>
<command>
for f in LICENSE Makefile mktxt README
*.{dbx,xsl} ; \
@@ -347,6 +349,12 @@
cp doc/html/refman/*.png
$(PKGNAME)/doc/html/refman
</command>
</if>
+ <if cond="BUILDDOCS=='no'">
+ <command>
+ mkdir -p $(PKGNAME)/doc/html
$(PKGNAME)/doc/pdf ;
+ cp -r doc/README* doc/ssqls-pretty
$(PKGNAME)/doc
+ </command>
+ </if>
<!-- examples subdir -->
<command>
Modified: trunk/mysql++.spec.in
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.spec.in?rev=1644&r1=1643&r2=1644&view=diff
==============================================================================
--- trunk/mysql++.spec.in (original)
+++ trunk/mysql++.spec.in Mon Jul 2 21:41:09 2007
@@ -79,9 +79,12 @@
%files manuals
%defattr(-,root,root,-)
-%doc doc/*.pdf doc/html doc/README.manuals
+%doc doc/html doc/pdf doc/README.manuals
%changelog
+* Mon Jul 2 2007 Warren Young <[EMAIL PROTECTED]> 2.3.0-1
+- Reflected changes to doc dir layout in manuals sub-package
+
* Mon Mar 19 2007 Warren Young <[EMAIL PROTECTED]> 2.2.1-4
- Reorganized locations of generated documentation
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
