Changeset 28570

Show
Ignore:
Timestamp:
31.10.2013 16:05:29 (6 years ago)
Author:
ak19
Message:

Related to Dr Bainbridge's bugfix of 28569: shouldn't have the .fixed-prefix.awk fie in the final gnome-lib-minimal generated for distribution, else the file is not regenerated with local paths and then gs2/wvware can't be compiled against that gnome-lib-minimal

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/cascade-make/trunk/lib/cascade-lib.bash

    r28292 r28570  
    151151 
    152152  local tarname="gnome-lib-minimal" 
    153   
     153 
    154154  if [ $distos = "linux" ] ; then 
    155155      tarname="$tarname-linux" 
     
    161161  elif [ $distos = "darwin" ] ; then 
    162162      if [ $OSTYPE != "darwin9.0" ] ; then 
    163       tarname="$tarname-$OSTYPE-intel" 
     163      tarname="$tarname-darwin-Lion-intel" 
    164164      else 
    165165      tarname="$tarname-darwin-intel" 
     
    167167  fi 
    168168 
    169   tar cvzf $tarname.tar.gz $distlist 
     169  # copy all the files except $OS/lib/pkconfig/.fixed-prefix.awk across. The absence of that last file will ensure that gnome-lib-minimal 
     170  # does not point to the path where it was compiled when compiling wvware against a gnome-lib-minimal in a GS2 located elsewhere 
     171  # http://www.gnu.org/software/tar/manual/html_node/exclude.html and http://www.tldp.org/LDP/abs/html/comparison-ops.html 
     172  tar cvzf $tarname.tar.gz --exclude=.fixed-prefix.awk $distlist 
    170173  mv $tarname.tar.gz $dirname/. 
    171174