Changeset 729 in MondoRescue for trunk/tools/svn2build


Ignore:
Timestamp:
Jul 30, 2006, 4:06:39 PM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r686:728 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/svn2build

    r672 r729  
    3737    v=`cat ${SVNBRANCH}/$p/VERSION`
    3838    echo "Management of $p $v-$REVISION"
    39     dest="$p-$v-$TAG"
     39    dest="$p-$v"
    4040    rm -fr $dest
    4141    svn export ${SVNBRANCH}/$p $dest
     
    7272            fi
    7373            echo "Using $inc customization to build SPEC file"
    74             m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
    7574
    7675            $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.spec
     
    7978                exit -1
    8079            fi
    81             cat $TMP/$p.spec >> $dest/distributions/${ddir}-$dver/$p.spec
     80            m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $TMP/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
     81
    8282            rm -f $TMP/$p.spec
    8383        elif [ "$dtype" = "ebuild" ]; then
     
    116116    if [ _"`echo $p | grep -v kernel | grep mindi`" != _"" ]; then
    117117        v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
    118         if [ ! -d mondo-doc-$v1-$TAG ]; then
     118        if [ ! -d mondo-doc-$v1 ]; then
    119119            echo "mondo-doc should be created before $p"
    120120            exit -1
    121121        fi
    122         (cd mondo-doc-$v1-$TAG ; make -f Makefile.man install-$p INSTALLDIR=../$dest)
     122        (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$dest)
    123123        rm -f $dest/rootfs/sbin/parted2fdisk-ia64
    124124    fi
    125125    if [ "`echo $p | grep -v doc | grep  mondo`" != "" ]; then
    126126        v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
    127         if [ ! -d mondo-doc-$v1-$TAG ]; then
     127        if [ ! -d mondo-doc-$v1 ]; then
    128128            echo "mondo-doc should be created before $p"
    129129            exit -1
    130130        fi
    131         (cd mondo-doc-$v1-$TAG ; make -f Makefile.howto install INSTALLDIR=../$dest/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$dest/docs/man)
     131        (cd mondo-doc-$v1 ; make -f Makefile.howto install INSTALLDIR=../$dest/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$dest/docs/man)
    132132        (cd $dest ; echo "Bootstraping mondo ... " ; ./bootstrap)
    133133    fi
Note: See TracChangeset for help on using the changeset viewer.