X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=SPECS%2Fbuild-nmh-cygwin;h=1158619ed2f2d8dd8e05cbf3cee80f7d35eab3d5;hb=ba48f99120f794a4b265069a95d8d8b84b1e84f4;hp=2f18d7efa9c4ceb7f1a41bc7df3360986e75a776;hpb=5dd60d56dddeb759395a09d4cf725bcc81cdca85;p=mmh

diff --git a/SPECS/build-nmh-cygwin b/SPECS/build-nmh-cygwin
index 2f18d7e..1158619 100755
--- a/SPECS/build-nmh-cygwin
+++ b/SPECS/build-nmh-cygwin
@@ -1,5 +1,13 @@
 #!/bin/bash
 #
+# ==========================================================================
+# Change from generic-build-script:  added this comment block.
+# Based on Cygwin generic package build script, customized for nmh.
+#
+# This script is incompatible with directory names that contain spaces, etc.
+# To fix that, a whole bunch of shell variables need to be wrapped with "".
+# ==========================================================================
+#
 # Generic package build script
 #
 # $Id: generic-build-script,v 1.47 2006/02/01 14:01:14 igor Exp $
@@ -40,13 +48,19 @@ export REL=`echo $tscriptname | sed -e "s/${PKG}\-${VER}\-//"`
 # from the upstream package name, you will want to redefine BASEPKG.
 # Example: For Apache 2, BASEPKG=httpd-2.x.xx but SHORTPKG=apache2-2.x.xx
 export BASEPKG=${PKG}-${VER}
+# Change from generic-build-script:  redefined BASEPKG.
+export BASEPKG=${PKG}-${VER}-RC2
 export SHORTPKG=${PKG}-${VER}
 export FULLPKG=${SHORTPKG}-${REL}
 
 # determine correct decompression option and tarball filename
-export src_orig_pkg_name=
+# Change from generic-build-script:  set scr_orig_pkg_name here.
+export src_orig_pkg_name=nmh-1.5-RC2.tar.gz
 if [ -e "${src_orig_pkg_name}" ] ; then
-  export opt_decomp=? # Make sure tar punts if unpack() is not redefined
+  # Change from generic-build-script:  don't need the following line, use
+  # opt_decomp of z.
+  # export opt_decomp=? # Make sure tar punts if unpack() is not redefined
+  export opt_decomp=z
 elif [ -e ${BASEPKG}.tar.bz2 ] ; then
   export opt_decomp=j
   export src_orig_pkg_name=${BASEPKG}.tar.bz2
@@ -101,6 +115,8 @@ if [ -z "$MY_LDFLAGS" ]; then
   MY_LDFLAGS=
 fi
 
+# Change from generic-build-script: removed ChangeLog because the nmh
+# Makefile installs it.
 export install_docs="\
 	ABOUT-NLS \
 	ANNOUNCE \
@@ -112,7 +128,6 @@ export install_docs="\
 	COPYRIGHT \
 	CREDITS \
 	CHANGELOG \
-	ChangeLog* \
 	FAQ \
 	HOW-TO-CONTRIBUTE \
 	INSTALL \
@@ -213,8 +228,10 @@ prep_log() {
   prep "$@" && \
   mkdirs_log && \
   if [ -f ${topdir}/${log_pkg_name} ] ; then \
-    cd ${buildlogdir} && \
-    tar xvjf ${topdir}/${log_pkg_name}
+    # Change from generic-build-script:  do the following in subshell
+    # so that cd isn't permanent.
+    (cd ${buildlogdir} && \
+    tar xvjf "${topdir}"/${log_pkg_name})
   fi
 }
 
@@ -274,6 +291,8 @@ clean() {
 }
 
 # Install the package, with DESTDIR set to '.inst'.
+# Change from generic-build-script:  added ":;" after "find ... | gzip"
+# because it returns non-zero status.
 install() {
   (cd ${objdir} && \
   rm -fr ${instdir}/* && \
@@ -294,7 +313,7 @@ install() {
   if [ -d ${instdir}${prefix}/share/man ] ; then \
     find ${instdir}${prefix}/share/man -name "*.1" -o -name "*.3" -o \
       -name "*.3x" -o -name "*.3pm" -o -name "*.5" -o -name "*.6" -o \
-      -name "*.7" -o -name "*.8" | xargs -r gzip -q ; \
+      -name "*.7" -o -name "*.8" | xargs -r gzip -q ; :; \
   fi && \
   templist="" && \
   for fp in ${install_docs} ; do \