You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Stefan Sperling <st...@elego.de> on 2009/04/10 14:14:04 UTC
Re: svn commit: r37145 - trunk
On Thu, Apr 09, 2009 at 01:25:26PM -0700, Hyrum K. Wright wrote:
> Author: hwright
> Date: Thu Apr 9 13:25:25 2009
> New Revision: 37145
>
> Log:
> Fix the build by falling back to the system svnversion if the just-built one
> fails. See this thread for more information:
> http://svn.haxx.se/dev/archive-2009-04/0262.shtml
>
> * Makefile.in:
> (revision-install): If the just-build svnversion fails, try the
> system-installed one. If that also fails, just bail and print "unknown".
>
> Modified:
> trunk/Makefile.in
This commit caused make to complain here:
Using undefined dynamic variable $? (line 380 of Makefile)
I think you wanted:
Index: Makefile.in
===================================================================
--- Makefile.in (revision 37157)
+++ Makefile.in (working copy)
@@ -370,10 +370,10 @@
revision-install:
subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > \
$(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
- if test "$?" != "0"; then \
+ if test "$$?" != "0"; then \
svnversion $(top_srcdir) /repos/svn/trunk > \
$(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
- if test "$?" != "0"; then \
+ if test "$$?" != "0"; then \
echo "unknown" > \
$(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
fi; \
Stefan
Re: svn commit: r37145 - trunk
Posted by Stefan Sperling <st...@elego.de>.
On Fri, Apr 10, 2009 at 09:24:18AM -0500, Hyrum K. Wright wrote:
> On Apr 10, 2009, at 9:14 AM, Stefan Sperling wrote:
>> I think you wanted:
>>
>> Index: Makefile.in
>> ===================================================================
>> --- Makefile.in (revision 37157)
>> +++ Makefile.in (working copy)
>> @@ -370,10 +370,10 @@
>> revision-install:
>> subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > \
>> $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
>> - if test "$?" != "0"; then \
>> + if test "$$?" != "0"; then \
>> svnversion $(top_srcdir) /repos/svn/trunk > \
>> $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
>> - if test "$?" != "0"; then \
>> + if test "$$?" != "0"; then \
>> echo "unknown" > \
>> $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
>> fi; \
>
> Yes, I believe I did. Would you mind making the change?
Not a bother. r37165.
Stefan
Re: svn commit: r37145 - trunk
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
On Apr 10, 2009, at 9:14 AM, Stefan Sperling wrote:
> On Thu, Apr 09, 2009 at 01:25:26PM -0700, Hyrum K. Wright wrote:
>> Author: hwright
>> Date: Thu Apr 9 13:25:25 2009
>> New Revision: 37145
>>
>> Log:
>> Fix the build by falling back to the system svnversion if the just-
>> built one
>> fails. See this thread for more information:
>> http://svn.haxx.se/dev/archive-2009-04/0262.shtml
>>
>> * Makefile.in:
>> (revision-install): If the just-build svnversion fails, try the
>> system-installed one. If that also fails, just bail and print
>> "unknown".
>>
>> Modified:
>> trunk/Makefile.in
>
> This commit caused make to complain here:
>
> Using undefined dynamic variable $? (line 380 of Makefile)
>
> I think you wanted:
>
> Index: Makefile.in
> ===================================================================
> --- Makefile.in (revision 37157)
> +++ Makefile.in (working copy)
> @@ -370,10 +370,10 @@
> revision-install:
> subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > \
> $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
> - if test "$?" != "0"; then \
> + if test "$$?" != "0"; then \
> svnversion $(top_srcdir) /repos/svn/trunk > \
> $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
> - if test "$?" != "0"; then \
> + if test "$$?" != "0"; then \
> echo "unknown" > \
> $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
> fi; \
Yes, I believe I did. Would you mind making the change?
-Hyrum
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1631486