You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ne...@apache.org on 2010/01/27 01:04:17 UTC

svn commit: r903507 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

Author: neels
Date: Wed Jan 27 00:04:16 2010
New Revision: 903507

URL: http://svn.apache.org/viewvc?rev=903507&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Add missing line ending chars.

Modified:
    subversion/trunk/tools/dev/unix-build/Makefile.svn

Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=903507&r1=903506&r2=903507&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Wed Jan 27 00:04:16 2010
@@ -660,18 +660,18 @@
 $(SVN_OBJDIR)/.bindings-installed: $(SVN_OBJDIR)/.bindings-compiled
 	if [ $(ENABLE_PYTHON_BINDINGS) = yes ]; then \
 		cd $(svn_builddir) \
-		  && make install-swig-py
+		  && make install-swig-py; \
 	fi
 	if [ $(ENABLE_RUBY_BINDINGS) = yes ]; then \
 		cd $(svn_builddir) \
-			&& make install-swig-rb
+			&& make install-swig-rb; \
 	fi
 	if [ $(ENABLE_PERL_BINDINGS) = yes ]; then \
 		cd $(svn_builddir) \
 	    && make install-swig-pl-lib; \
 	  cd subversion/bindings/swig/perl/native \
 		  && perl Makefile.PL PREFIX="$(SVN_PREFIX)" \
-		  && make install
+		  && make install; \
 	fi
 	touch $@
 



Re: svn commit: r903507 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
On Jan 27, 2010, at 12:22 AM, Stefan Sperling wrote:

> On Tue, Jan 26, 2010 at 05:11:46PM -0800, Hyrum K. Wright wrote:
>> 
>> On Jan 26, 2010, at 4:04 PM, neels@apache.org wrote:
>> 
>>> Author: neels
>>> Date: Wed Jan 27 00:04:16 2010
>>> New Revision: 903507
>>> 
>>> URL: http://svn.apache.org/viewvc?rev=903507&view=rev
>>> Log:
>>> * tools/dev/unix-build/Makefile.svn: Add missing line ending chars.
>> 
>> I'm curious: why do we need to make this change?  It would appear to me that the prior version would work just fine.
> 
>>> $(SVN_OBJDIR)/.bindings-installed: $(SVN_OBJDIR)/.bindings-compiled
>>> 	if [ $(ENABLE_PYTHON_BINDINGS) = yes ]; then \
>>> 		cd $(svn_builddir) \
>>> -		  && make install-swig-py
>>> +		  && make install-swig-py; \
>>> 	fi
> 
> I guess without ; \, make will try to execute 'fi'
> on its own. All shell commands need to be on a single
> logical line (from make's point of view).

Ah, yes.  I didn't realize it was in a Makefile.

-Hyrum

Re: svn commit: r903507 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

Posted by Stefan Sperling <st...@elego.de>.
On Tue, Jan 26, 2010 at 05:11:46PM -0800, Hyrum K. Wright wrote:
> 
> On Jan 26, 2010, at 4:04 PM, neels@apache.org wrote:
> 
> > Author: neels
> > Date: Wed Jan 27 00:04:16 2010
> > New Revision: 903507
> > 
> > URL: http://svn.apache.org/viewvc?rev=903507&view=rev
> > Log:
> > * tools/dev/unix-build/Makefile.svn: Add missing line ending chars.
> 
> I'm curious: why do we need to make this change?  It would appear to me that the prior version would work just fine.

> > $(SVN_OBJDIR)/.bindings-installed: $(SVN_OBJDIR)/.bindings-compiled
> > 	if [ $(ENABLE_PYTHON_BINDINGS) = yes ]; then \
> > 		cd $(svn_builddir) \
> > -		  && make install-swig-py
> > +		  && make install-swig-py; \
> > 	fi

I guess without ; \, make will try to execute 'fi'
on its own. All shell commands need to be on a single
logical line (from make's point of view).

Stefan

Re: svn commit: r903507 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
On Jan 26, 2010, at 4:04 PM, neels@apache.org wrote:

> Author: neels
> Date: Wed Jan 27 00:04:16 2010
> New Revision: 903507
> 
> URL: http://svn.apache.org/viewvc?rev=903507&view=rev
> Log:
> * tools/dev/unix-build/Makefile.svn: Add missing line ending chars.

I'm curious: why do we need to make this change?  It would appear to me that the prior version would work just fine.

-Hyrum

> 
> Modified:
>    subversion/trunk/tools/dev/unix-build/Makefile.svn
> 
> Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
> URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=903507&r1=903506&r2=903507&view=diff
> ==============================================================================
> --- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
> +++ subversion/trunk/tools/dev/unix-build/Makefile.svn Wed Jan 27 00:04:16 2010
> @@ -660,18 +660,18 @@
> $(SVN_OBJDIR)/.bindings-installed: $(SVN_OBJDIR)/.bindings-compiled
> 	if [ $(ENABLE_PYTHON_BINDINGS) = yes ]; then \
> 		cd $(svn_builddir) \
> -		  && make install-swig-py
> +		  && make install-swig-py; \
> 	fi
> 	if [ $(ENABLE_RUBY_BINDINGS) = yes ]; then \
> 		cd $(svn_builddir) \
> -			&& make install-swig-rb
> +			&& make install-swig-rb; \
> 	fi
> 	if [ $(ENABLE_PERL_BINDINGS) = yes ]; then \
> 		cd $(svn_builddir) \
> 	    && make install-swig-pl-lib; \
> 	  cd subversion/bindings/swig/perl/native \
> 		  && perl Makefile.PL PREFIX="$(SVN_PREFIX)" \
> -		  && make install
> +		  && make install; \
> 	fi
> 	touch $@
> 
> 
>