Mailing-List: contact cygwin-apps-help AT cygwin DOT com; run by ezmlm
Sender: cygwin-apps-owner AT cygwin DOT com
List-Subscribe: <mailto:cygwin-apps-subscribe AT cygwin DOT com>
List-Archive: <http://sources.redhat.com/ml/cygwin-apps/>
List-Post: <mailto:cygwin-apps AT cygwin DOT com>
List-Help: <mailto:cygwin-apps-help AT cygwin DOT com>, <http://sources.redhat.com/lists.html#faqs>
Delivered-To: mailing list cygwin-apps AT cygwin DOT com
Date: Tue, 19 Mar 2002 12:52:25 -0500
From: Christopher Faylor <cgf AT redhat DOT com>
To: cygwin-apps AT cygwin DOT com
Subject: [PATCH] Reinstate version number magic in Makefile.in for setup.exe
Message-ID: <20020319175225.GA16407@redhat.com>
Reply-To: cygwin-apps AT cygwin DOT com
Mail-Followup-To: cygwin-apps AT cygwin DOT com
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.3.23.1i

Checked into branch and trunk.  I uploaded a new version of setup.exe to
sources.redhat.com, too, since this was affecting setup.ini creation.

cgf

2002-03-19  Christopher Faylor  <cgf AT redhat DOT com>

        * Makefile.in (setup_version.c): Add back magic which allows detection
        of setup.exe version number.

Index: Makefile.in
===================================================================
RCS file: /cvs/uberbaum/winsup/cinstall/Makefile.in,v
retrieving revision 2.51
retrieving revision 2.51.2.1
diff -u -p -r2.51 -r2.51.2.1
--- Makefile.in	2002/02/18 13:53:06	2.51
+++ Makefile.in	2002/03/19 17:35:43	2.51.2.1
@@ -212,7 +212,9 @@ setup_version.c : $(srcdir)/ChangeLog Ma
 	V=`grep '^\$$Revision.*' $(srcdir)/ChangeLog \
 	| sed -e 's/\$$Revision:* *//' \
 	  -e 's/ *$$.*//'` ;\
-	echo "const char *version = \"$$V\";" > version.tmp ;\
+	(echo '#define VERSION_PREFIX "%%% setup-version"';\
+        echo 'static const char version_store[] = VERSION_PREFIX " '$$V'";';\
+        echo 'const char *version = version_store + sizeof (VERSION_PREFIX);') > version.tmp;\
 	mv version.tmp setup_version.c
 
 %.o: %.rc