Makefile in trunk

Alexander E. Patrakov patrakov at ums.usu.ru
Mon Sep 5 22:36:40 PDT 2005


Hello,

I attempted to merge changes from the trunk to the utf8-newmake branch. 
There were conflicts. One of them:

(in Makefile):

lfs-base: lfsuser
<snip>
         @chroot "$(MP)" $(chenv-post-bash) 'set +h && cd $(ROOT) && \
          make post-bash $(chbash-post-bash)'
<<<<<<< .working
         @-ln -s $(WD)/bin/wget $(MP)/usr/bin/wget
=======
         @ln -s $(WD)/bin/wget $(MP)/usr/bin/wget
 >>>>>>> .merge-right.r618

It looks like I added the dash in r576 to avoid failures during the 
rebuild. Please propagate to trunk if you agree that there may be more 
than one attempt to create this symlink.

-- 
Alexander E. Patrakov



More information about the livecd mailing list