Mailing-List: contact cygwin-help@sourceware.cygnus.com; run by ezmlm List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner@sourceware.cygnus.com Delivered-To: mailing list cygwin@sourceware.cygnus.com From: Chris Faylor Date: Thu, 13 Jan 2000 15:37:51 -0500 To: Alexey Voinov Cc: cygwin@sourceware.cygnus.com Subject: Re: winsup/mkvers.sh Message-ID: <20000113153751.A8595@cygnus.com> Mail-Followup-To: Alexey Voinov , cygwin@sourceware.cygnus.com References: <16869.000113@caravan.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0i In-Reply-To: <16869.000113@caravan.ru>; from voins@caravan.ru on Thu, Jan 13, 2000 at 08:51:27PM +0300 On Thu, Jan 13, 2000 at 08:51:27PM +0300, Alexey Voinov wrote: >Hello, > > There's possibly error in winsup/cygwin/mkvers.sh > in the last line: >$windres --include-dir $dir/../w32api/include --include-dir $dir/include --define CYGWIN_BUILD_DATE="$1" --define CYGWIN_BUILD_TIME="$2" --define CYGWIN_VERSION='"'"$cygwin_ver"'"' $rcfile winver.o > ^^^^ >$dir can be =="" then include path will be /../w32api/include instead >of ../w32api/include > >It can be replaced with ${dir:+$dir/}, then there will be no problems. >Here's little patch ( patch -p 0 ): >--- mkvers.sh.old Thu Jan 13 19:43:22 2000 >+++ mkvers.sh Thu Jan 13 19:45:22 2000 >@@ -162,4 +162,4 @@ > fi > > set -$- $builddate >-$windres --include-dir $dir/../w32api/include --include-dir $dir/include --define CYGWIN_BUILD_DATE="$1" --define CYGWIN_BUILD_TIME="$2" --define CYGWIN_VERSION='"'"$cygwin_ver"'"' $rcfile winver.o >+$windres --include-dir ${dir:+$dir/}../w32api/include --include-dir ${dir:+$dir/}include --define CYGWIN_BUILD_DATE="$1" --define CYGWIN_BUILD_TIME="$2" --define CYGWIN_VERSION='"'"$cygwin_ver"'"' $rcfile winver.o It sounds like you're fixing the symptom rather than the problem. In what situations is $dir empty? It is never supposed to be empty. cgf -- Want to unsubscribe from this list? Send a message to cygwin-unsubscribe@sourceware.cygnus.com