[Mysqlpp-commits] r2536 - /trunk/mysql++.bkl

[mysqlpp]

Author: wyoung
Date: Thu Jun 25 08:18:59 2009
New Revision: 2536

URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2536&view=rev
Log:
Replaced bash(1) glob shorthands with more portable Bourne shell globs
in Bakefile commands, as Ubuntu doesn't use bash for /bin/sh, nor do
some other POSIX systems.  Can't use the targets that required these
bash-isms, like dist.  There's still one left, but it's pretty
maintainer-specific.

Modified:
    trunk/mysql++.bkl

Modified: trunk/mysql++.bkl
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=2536&r1=2535&r2=2536&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Thu Jun 25 08:18:59 2009
@@ -418,7 +418,8 @@
     <action id="@package_n...@-@PACKAGE_VERSION@">
       <!-- Set up package directory -->
       <command>
-        for d in config doc/{.,html}/{refman,userman} examples lib test ; \
+        for d in config doc/html/refman doc/html/userman \
+            doc/refman doc/userman examples lib test ; \
         do \
           mkdir -p $(PKGNAME)/$(DDD) ; \
         done
@@ -437,7 +438,7 @@
       <command>
         for d in vc200? ; do \
           mkdir -p $(PKGNAME)/$(DDD) ; \
-          cp $(DDD)/*.{sln,vcproj} $(PKGNAME)/$(DDD) ; \
+          cp $(DDD)/*.sln $(DDD)/*.vcproj $(PKGNAME)/$(DDD) ; \
         done
       </command>
 
@@ -450,14 +451,14 @@
           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} ; \
+          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 \
+            for f in *.css *.html ; do \
               cp doc/html/$(DDD)/$(DDF) $(PKGNAME)/doc/html/$(DDD) ; \
             done ; \
           done
@@ -477,20 +478,19 @@
 
       <!-- examples subdir -->
       <command>
-        cp examples/*.{cpp,h,jpg} $(PKGNAME)/examples
+        cp examples/*.cpp examples/*.h examples/*.jpg $(PKGNAME)/examples
       </command>
       <command>
         for d in mfc wforms ; \
         do \
           mkdir -p $(PKGNAME)/examples/vstudio/$(DDD) ; \
-          cp examples/vstudio/$(DDD)/*.{cpp,h,r*,vcproj} \
-            $(PKGNAME)/examples/vstudio/$(DDD) ; \
+          cp examples/vstudio/$(DDD)/* $(PKGNAME)/examples/vstudio/$(DDD) ; \
         done
       </command>
 
       <!-- lib subdir -->
       <command>
-        cp lib/*.{cpp,h,in,pl} $(PKGNAME)/lib
+        cp lib/*.cpp lib/*.h lib/*.in lib/*.pl $(PKGNAME)/lib
       </command>
 
       <!-- test subdir -->
@@ -500,7 +500,9 @@
 
       <!-- re-bootstrap it to get a standard configuration -->
       <command>cd $(PKGNAME) ; ./bootstrap nodoc nomaint</command>
-      <command>rm -f $(PKGNAME)/Makefile 
$(PKGNAME)/config.{log,status}</command>
+      <command>rm -f $(PKGNAME)/Makefile</command>
+      <command>rm -f $(PKGNAME)/config.log</command>
+      <command>rm -f $(PKGNAME)/config.status</command>
       <command>rm -fr $(PKGNAME)/autom4te.cache</command>
     </action>
 


_______________________________________________
Mysqlpp-commits mailing list
Mysqlpp-commits@gna.org
https://mail.gna.org/listinfo/mysqlpp-commits