Changeset 1026


Ignore:
Timestamp:
Jan 3, 2007, 2:37:01 AM (12 years ago)
Author:
bruno
Message:

Still on slackware_10.2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.1/tools/build2pkg

    r1025 r1026  
    126126        # Et voila !
    127127    elif [  _"$dfam" = _"slackware" ]; then
    128         mkdir -p $TOPBUILDDIR/install
     128        mkdir -p $TOPBUILDDIR/build-${p}/install
    129129        cd $TOPBUILDDIR
    130130        tar xfz $src
    131131        cd ${p}-${PVER}
    132         mv distributions/${ddir}-$dver/slack-* $TOPBUILDDIR/install
     132        mv distributions/${ddir}-$dver/slack-* $TOPBUILDDIR/build-${p}/install
    133133        if [ -e distributions/${ddir}-$dver/doinst.sh ]; then
    134             mv distributions/${ddir}-$dver/doinst.sh $TOPBUILDDIR/install
     134            mv distributions/${ddir}-$dver/doinst.sh $TOPBUILDDIR/build-${p}/install
    135135        fi
    136136        if [ _"$p" = _"mindi-busybox" ]; then
    137137            make oldconfig
    138138            make busybox
    139             DESTDIR=$TOPBUILDDIR/usr/lib/mindi/rootfs
     139            DESTDIR=$TOPBUILDDIR/build-${p}/usr/lib/mindi/rootfs
    140140            make PREFIX=$DESTDIR install
    141141        elif [ _"$p" = _"mindi" ]; then
    142142            export DONT_RELINK=1
    143             export HEAD=$TOPBUILDDIR
     143            export HEAD=$TOPBUILDDIR/build-${p}
    144144            export PREFIX=/usr
    145145            export CONFDIR=/etc
     
    152152            ./configure --prefix=/usr
    153153            make VERSION=$PVER
    154             make DESTDIR=$TOPBUILDDIR install
     154            make DESTDIR=$TOPBUILDDIR/build-${p} install
    155155        elif [ _"$p" = _"mondo-doc" ]; then
    156156            make -f Makefile.man VERSION=$PVER
    157157            make -f Makefile.howto VERSION=$PVER
    158             make -f Makefile.man install INSTALLDIR=$TOPBUILDDIR/usr/doc/$p-${PVER}
    159             make -f Makefile.howto install INSTALLDIR=$TOPBUILDDIR/usr/doc/$p-${PVER}
     158            make -f Makefile.man install INSTALLDIR=$TOPBUILDDIR/build-${p}/usr/doc/$p-${PVER}
     159            make -f Makefile.howto install INSTALLDIR=$TOPBUILDDIR/build-${p}/usr/doc/$p-${PVER}
    160160        else
    161161            echo "Package $p not configured for $dfam"
    162162        fi
    163         cd $TOPBUILDDIR
    164         rm -rf src
     163        cd $TOPBUILDDIR/build-${p}
    165164        ar=`arch`
    166165        pkg1=$p-${PVER}-${ar}-${TAG}mr.tgz
    167         sudo "/sbin/makepkg -p -l -c $pkg1"
     166        sudo /sbin/makepkg -p -l -c $pkg1
    168167        export pkg="$pkg $pkg1"
    169168    else
Note: See TracChangeset for help on using the changeset viewer.