Stefan Reichör <[EMAIL PROTECTED]> writes: > Hi Daniel! > >> Committed revision 148 to http://www.asgardr.info/~nebu/archives/dvc.dev/ >> >> Add missing Makefile rule. >> >> * lisp/Makefile.in (dvc-site.el): add dvc-site.el.in Makefile rule.
Oh, I missed that commit when looking through the list archives. Sorry, Daniel. > I tried to merge your patch and I got the following conflict. > > The current solution is from Toby Allsopp > > === modified file 'lisp/Makefile.in' > --- lisp/Makefile.in 2008-01-23 17:11:58 +0000 > +++ lisp/Makefile.in 2008-01-23 19:45:59 +0000 > @@ -139,5 +139,11 @@ > chmod -w $@ > endif > > +<<<<<<< TREE > dvc-site.el: ../config.status @srcdir@/dvc-site.el.in > +======= > +dvc-site.el.in: ../config.status > + (cd .. ; ./configu.status listp/$@) > +dvc-site.el: ../config.status > +>>>>>>> MERGE-SOURCE > (cd .. ; ./config.status lisp/$@) > > > Toby, Daniel: could you please discuss a solution that works for both > of you. I think both patches work, but mine has the advantages of (a) picking up changes to dvc-site.el.in in the source directory and (b) not introducing a bogus rule for building dvc-site.el.in in the build directory. Regards, Toby. _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
