Changeset 1026 in MondoRescue

Timestamp:

Jan 3, 2007, 2:37:01 AM (18 years ago)

Author:

Bruno Cornec

Message:

Still on slackware_10.2

File:

• branches/2.2.1/tools/build2pkg (modified) (2 diffs)

branches/2.2.1/tools/build2pkg

@@ -126 +126 @@
         # Et voila !
     elif [  _"$dfam" = _"slackware" ]; then
-        mkdir -p $TOPBUILDDIR/install
+        mkdir -p $TOPBUILDDIR/build-${p}/install
         cd $TOPBUILDDIR
         tar xfz $src
         cd ${p}-${PVER}
-        mv distributions/${ddir}-$dver/slack-* $TOPBUILDDIR/install
+        mv distributions/${ddir}-$dver/slack-* $TOPBUILDDIR/build-${p}/install
         if [ -e distributions/${ddir}-$dver/doinst.sh ]; then
-            mv distributions/${ddir}-$dver/doinst.sh $TOPBUILDDIR/install
+            mv distributions/${ddir}-$dver/doinst.sh $TOPBUILDDIR/build-${p}/install
         fi
         if [ _"$p" = _"mindi-busybox" ]; then
             make oldconfig
             make busybox
-            DESTDIR=$TOPBUILDDIR/usr/lib/mindi/rootfs
+            DESTDIR=$TOPBUILDDIR/build-${p}/usr/lib/mindi/rootfs
             make PREFIX=$DESTDIR install
         elif [ _"$p" = _"mindi" ]; then
             export DONT_RELINK=1
-            export HEAD=$TOPBUILDDIR
+            export HEAD=$TOPBUILDDIR/build-${p}
             export PREFIX=/usr
             export CONFDIR=/etc
@@ -152 +152 @@
             ./configure --prefix=/usr
             make VERSION=$PVER
-            make DESTDIR=$TOPBUILDDIR install
+            make DESTDIR=$TOPBUILDDIR/build-${p} install
         elif [ _"$p" = _"mondo-doc" ]; then
             make -f Makefile.man VERSION=$PVER
             make -f Makefile.howto VERSION=$PVER
-            make -f Makefile.man install INSTALLDIR=$TOPBUILDDIR/usr/doc/$p-${PVER}
-            make -f Makefile.howto install INSTALLDIR=$TOPBUILDDIR/usr/doc/$p-${PVER}
+            make -f Makefile.man install INSTALLDIR=$TOPBUILDDIR/build-${p}/usr/doc/$p-${PVER}
+            make -f Makefile.howto install INSTALLDIR=$TOPBUILDDIR/build-${p}/usr/doc/$p-${PVER}
         else
             echo "Package $p not configured for $dfam"
         fi
-        cd $TOPBUILDDIR
-        rm -rf src
+        cd $TOPBUILDDIR/build-${p}
         ar=`arch`
         pkg1=$p-${PVER}-${ar}-${TAG}mr.tgz
-        sudo "/sbin/makepkg -p -l -c $pkg1"
+        sudo /sbin/makepkg -p -l -c $pkg1
         export pkg="$pkg $pkg1"
     else