Status of the merge

[Dave Jones]

On Wed, May 02, 2007 at 03:42:47PM -0700, Jesse Keating wrote:
 > On Wednesday 02 May 2007 15:39:52 Roland McGrath wrote:
 > > The useless email I got made it look like extras/foo/devel/Makefile was
 > > getting fresh boilerplate, not copying dist/foo/devel/Makefile.  Is this
 > > going to lose custom Core devel/Makefile or FC-*/Makefile contents that had
 > > a superset of the old /cvs/dist boilerplate Makefile functionality?
 > 
 > Yes, cvs.fedora Makefile.common diverged from Red Hat's internal 
 > Makefile.common.  Much in RH's doesn't make sense in Fedora's, but some does.  
 > If you find functionality missing, please request specific things get added 
 > in.

Comparing the diff, this is one thing that jumped out at me which would
be nice to have (again).

@@ -151,7 +175,13 @@ sources: $(SOURCEFILES) $(TARGETS)
 # Retrieve the sources we do not have in CVS
 $(SOURCEFILES): #FORCE
        @mkdir -p $(SOURCEDIR)
-       @echo "Downloading $@..."
+       @for i in `find ../ -maxdepth 2 -name "$@"`; do \
+           if test "$$(md5sum $$i | awk '{print $$1}')" = "$(get_sources_md5)"  ; then \
+               echo "Copying from $$i" ; \
+               ln $$i $@ ; \
+               break ; \
+           fi ; \
+       done 
        @if [ ! -e "$@" ] ; then $(CLIENT) $(REPOSITORY)/$(NAME)/$@/$(get_sources_md5)/$@  ; fi
        @if [ ! -e "$@" ] ; then echo "Could not download source file: $@ does not exist" ; exit 1 ; fi
        @if test "$$(md5sum $@ | awk '{print $$1}')" != "$(get_sources_md5)" ; then \



-- 
http://www.codemonkey.org.uk