From: David Levine <levinedl@acm.org>
Date: Wed, 9 May 2012 03:19:29 +0000 (-0500)
Subject: Skip the Cygwin package (.bz2) file when searching for the input (.gz) file.
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=674c6f70fa9371ce754daddc0441fff26279a54c;p=mmh

Skip the Cygwin package (.bz2) file when searching for the input (.gz) file.
---

diff --git a/SPECS/build-nmh-cygwin b/SPECS/build-nmh-cygwin
index e7ce976..47bcdd9 100755
--- a/SPECS/build-nmh-cygwin
+++ b/SPECS/build-nmh-cygwin
@@ -71,9 +71,11 @@ export FULLPKG=${SHORTPKG}${REL}
 export src_orig_pkg_name=
 if [ -e "${src_orig_pkg_name}" ] ; then
   export opt_decomp=? # Make sure tar punts if unpack() is not redefined
-elif [ -e ${BASEPKG}.tar.bz2 ] ; then
-  export opt_decomp=j
-  export src_orig_pkg_name=${BASEPKG}.tar.bz2
+# Change from generic-build-script: ${BASEPKG}.tar.bz2 is an output of
+#  this script, so don't trip over it on a rerun.
+# elif [ -e ${BASEPKG}.tar.bz2 ] ; then
+#   export opt_decomp=j
+#   export src_orig_pkg_name=${BASEPKG}.tar.bz2
 elif [ -e ${BASEPKG}.tar.gz ] ; then
   export opt_decomp=z
   export src_orig_pkg_name=${BASEPKG}.tar.gz