From 7a9faaefb4a32069d4949c4a64cbf20bed67dbe9 Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 21 Mar 2014 23:34:53 +0000 Subject: [PATCH] Since we're now maintaining our own Cygwin pseudo-repository directories instead of recommending that users install these packages from a local source, it makes more sense to name the packages according to Cygwin specs, so they can be copied as-is into the pseudo-repository. git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1195 632fc199-4ca6-4c93-a231-07263d6284db --- release/makecygwinpkg.in | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/release/makecygwinpkg.in b/release/makecygwinpkg.in index 5a5338a..f303546 100755 --- a/release/makecygwinpkg.in +++ b/release/makecygwinpkg.in @@ -17,19 +17,15 @@ onexit() PACKAGE_NAME=@PKGNAME@ VERSION=@VERSION@ +BUILD=@BUILD@ SRCDIR=@abs_top_srcdir@ -RPMARCH=@RPMARCH@ -PLATFORM=cygwin PREFIX=%{__prefix} DOCDIR=%{__docdir} LIBDIR=%{__libdir} umask 022 -if [ "$RPMARCH" = "x86_64" ]; then - PLATFORM=cygwin64 -fi -rm -f $PACKAGE_NAME-$VERSION-$PLATFORM.tar.bz2 +rm -f $PACKAGE_NAME-$VERSION-$BUILD.tar.bz2 TMPDIR=`mktemp -d /tmp/ljtbuild.XXXXXX` __PWD=`pwd` make install DESTDIR=$TMPDIR/pkg docdir=/usr/share/doc/$PACKAGE_NAME-$VERSION \ @@ -39,7 +35,7 @@ if [ "$PREFIX" = "/opt/libjpeg-turbo" -a "$DOCDIR" = "/opt/libjpeg-turbo/doc" ]; ln -fs /usr/share/doc/$PACKAGE_NAME-$VERSION $TMPDIR/pkg$DOCDIR fi cd $TMPDIR/pkg -tar cfj ../$PACKAGE_NAME-$VERSION-$PLATFORM.tar.bz2 * +tar cfj ../$PACKAGE_NAME-$VERSION-$BUILD.tar.bz2 * cd $__PWD mv $TMPDIR/*.tar.bz2 . -- 2.40.0