Author: wyoung
Date: Fri Feb 29 08:00:23 2008
New Revision: 2232

URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2232&view=rev
Log:
More dist and rpm target tweaks

Modified:
    trunk/mysql++.bkl

Modified: trunk/mysql++.bkl
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=2232&r1=2231&r2=2232&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Fri Feb 29 08:00:23 2008
@@ -432,33 +432,25 @@
             <command>cp config/*.m4 $(PKGNAME)/config</command>
 
             <!-- doc subdir -->
-            <if cond="BUILDDOCS=='yes'">
-                <command>
-                    cp -RL doc/README* doc/pdf doc/ssqls-pretty $(PKGNAME)/doc
-                </command>
-                <command>
-                    for f in LICENSE.txt Makefile mktxt README.txt 
\*.{dbx,in,xsl} ; \
-                    do \
-                        cp doc/userman/$(DDF) $(PKGNAME)/doc/userman ; \
-                    done
-                </command>
-                <command>
-                    for d in refman userman ; do \
-                        for f in *.{css,html} ; do \
-                            cp doc/html/$(DDD)/$(DDF) 
$(PKGNAME)/doc/html/$(DDD) ; \
-                        done ; \
-                    done
-                </command>
-                <command>
-                    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 -RL doc/README* doc/ssqls-pretty $(PKGNAME)/doc
-                </command>
-            </if>
+                       <command>
+                               cp -RL doc/README* doc/pdf doc/ssqls-pretty 
$(PKGNAME)/doc
+                       </command>
+                       <command>
+                               for f in LICENSE.txt Makefile mktxt README.txt 
\*.{dbx,in,xsl} ; \
+                               do \
+                                       cp doc/userman/$(DDF) 
$(PKGNAME)/doc/userman ; \
+                               done
+                       </command>
+                       <command>
+                               for d in refman userman ; do \
+                                       for f in *.{css,html} ; do \
+                                               cp doc/html/$(DDD)/$(DDF) 
$(PKGNAME)/doc/html/$(DDD) ; \
+                                       done ; \
+                               done
+                       </command>
+                       <command>
+                               cp doc/html/refman/*.png 
$(PKGNAME)/doc/html/refman
+                       </command>
 
             <!-- examples subdir -->
             <command>
@@ -501,17 +493,17 @@
         </action>
 
         <action id="rpm">
+            <depends>rpm-setup</depends>
+            <command>cd /usr/src/redhat/SPECS</command>
+            <command>rpmbuild -bb mysql++.spec</command>
+        </action>
+
+        <action id="srpm">
             <if cond="BUILDDOCS=='yes'">
                 <depends>doc</depends>
             </if>
             <depends>rpm-setup</depends>
             <command>cd /usr/src/redhat/SPECS</command>
-            <command>rpmbuild -bb mysql++.spec</command>
-        </action>
-
-        <action id="srpm">
-            <depends>rpm-setup</depends>
-            <command>cd /usr/src/redhat/SPECS</command>
             <command>rpmbuild -bs mysql++.spec</command>
         </action>
 


_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits

Reply via email to