more g-b-s patches

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Some minor nits with g-b-s, including some whitespace changes.

2005-07-30  Eric Blake  <[EMAIL PROTECTED]>

        * templates/generic-build-script (build): Variables must be
        set after make to override Makefile's setting.
        (test_rule): Default to check, since FSF coding standards and
        automake prefer that.
        (install_docs): Add USAGE.
        (list): Sort the list.
        (LC_ALL): Set, to ensure sane behavior with sort and others.
        (src_orig_pkg_name): Improve error message.

- --
Life is short - so eat dessert first!

Eric Blake             [EMAIL PROTECTED]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFC7hhL84KuGfSFAYARAm/CAJ9TPj7jLt2cFuKrbPNj7y1VLb5//wCfWvGG
6ZfyHCbdMim6cAcVJ8Kb7jQ=
=tbvQ
-----END PGP SIGNATURE-----

Index: templates/generic-build-script
===================================================================
RCS file: /cvs/cygwin-apps/packaging/templates/generic-build-script,v
retrieving revision 1.34
diff -u -p -r1.34 generic-build-script
--- templates/generic-build-script      30 Jul 2005 16:01:12 -0000      1.34
+++ templates/generic-build-script      1 Aug 2005 12:35:13 -0000
@@ -7,7 +7,7 @@
 # Package maintainers: if the original source is not distributed as a
 # (possibly compressed) tarball, set the value of ${src_orig_pkg_name},
 # and redefine the unpack() helper function appropriately.
-# Also, if the Makefile rule to run the test suite is not "test", change
+# Also, if the Makefile rule to run the test suite is not "check", change
 # the definition of ${test_rule} below.
 
 # find out where the build script is located
@@ -60,7 +60,8 @@ elif [ -e ${BASEPKG}.tar ] ; then
   export opt_decomp=
   export src_orig_pkg_name=${BASEPKG}.tar
 else
-  echo Cannot find original package.
+  echo "Cannot find PKG:${SHORTPKG} VER:${VER} REL:${REL}.  Rename $0 to"
+  echo "something more appropriate, and try again."
   exit 1
 fi
 
@@ -115,12 +116,15 @@ export install_docs="\
        RELEASE_NOTES \
        THANKS \
        TODO \
+       USAGE \
 "
 export install_docs="`for i in ${install_docs}; do echo $i; done | sort -u`"
-export test_rule=test
+export test_rule=check
 if [ -z "$SIG" ]; then
   export SIG=0 # set to 1 to turn on signing by default
 fi
+# Sort in POSIX order.
+export LC_ALL=C
 
 # helper functions
 
@@ -137,7 +141,7 @@ Actions are:
     conf, configure    Configure the package (./configure)
     reconf             Rerun configure
     build, make                Build the package (make)
-    check, test                Run the testsuite (make ${test_rule})
+    check, test                Run the testsuite (make ${test_rule})
     clean              Remove built files (make clean)
     install            Install package to staging area (make install)
     list               List package contents
@@ -203,7 +207,7 @@ reconf() {
 }
 build() {
   (cd ${objdir} && \
-  CFLAGS="${MY_CFLAGS}" make )
+  make CFLAGS="${MY_CFLAGS}" )
 }
 check() {
   (cd ${objdir} && \
@@ -292,7 +296,7 @@ strip() {
 }
 list() {
   (cd ${instdir} && \
-  find . -name "*" ! -type d | sed 's%^\.%  %' ; \
+  find . -name "*" ! -type d | sed 's%^\.%  %' | sort ; \
   true )
 }
 depend() {
@@ -379,7 +383,7 @@ checksig() {
 while test -n "$1" ; do
   case $1 in
     help|--help)       help ; STATUS=$? ;;
-    version|--version) version ; STATUS=$?;;
+    version|--version) version ; STATUS=$? ;;
     prep)              prep ; STATUS=$? ;;
     mkdirs)            mkdirs ; STATUS=$? ;;
     conf)              conf ; STATUS=$? ;;