On Wed, Nov 10, 2010 at 04:36:02AM -0600, Peter Samuelson wrote: > > [s...@apache.org] > > --- subversion/trunk/Makefile.in (original) > > +++ subversion/trunk/Makefile.in Tue Nov 9 23:23:10 2010 > > @@ -413,15 +413,11 @@ local-install: @INSTALL_RULES@ > > ### HACK!! Find a better way to do this > > revision-install: > > subversion/svnversion/svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \ > > - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \ > > - if test "$$?" != "0"; then \ > > + $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt || \ > > svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \ > > - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \ > > - if test "$$?" != "0"; then \ > > + $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt || \ > > echo "unknown" > \ > > - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \ > > - fi; \ > > - fi; > > + $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt > > Stefan, could you test this version on a BSD as well? Should do > exactly the same thing, and I think it's a little cleaner.
+1, works with BSD make. Thanks! > Peter > > [[[ > * Makefile.in > (revision-install): Followup r1033290 with an equivalent but slightly > cleaner way to write svn-revision.txt. > ]]] > Index: Makefile.in > =================================================================== > --- Makefile.in (revisione 1033405) > +++ Makefile.in (copia locale) > @@ -412,12 +412,10 @@ > > ### HACK!! Find a better way to do this > revision-install: > - subversion/svnversion/svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \ > - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt || \ > - svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \ > - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt || \ > - echo "unknown" > \ > - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt > + (subversion/svnversion/svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) || \ > + svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) || \ > + echo "unknown"; \ > + ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt > > install-static: @INSTALL_STATIC_RULES@ >
