Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23124/scripts
Modified Files:
perl
Log Message:
use DESTDIR, to get TMPDIR stuff working
Index: perl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/perl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- perl 13 Dec 2004 17:31:11 -0000 1.37
+++ perl 13 Dec 2004 18:45:23 -0000 1.38
@@ -33,19 +33,21 @@
echo >> ./hints/linux.sh
echo "archname='i$CONFIG_CPU-linux'" >> ./hints/linux.sh
- ./Configure -Dprefix=/usr -Dinstallprefix=$TMPDIR -Dusethreads -d -e || exit 1
+ #./Configure -Dprefix=/usr -Dinstallprefix=$TMPDIR -Dusethreads -d -e || exit 1
+ ./Configure -Dprefix=/usr -Dusethreads -d -e || exit 1
make $PMAKE || exit 1
#strip_debug
+ # I don't know why, but we loose the variable...
rm -rf $TMPDIR || exit 1
mkdir -p $TMPDIR || exit 1
- make install || exit 1
+ make install DESTDIR=$TMPDIR || exit 1
rm -f /usr/share/man/man1/s2p.1 /usr/share/man/man1/psed.1 /usr/share/man/man1/c2ph.1 /usr/share/man/man1/pstruct.1
rm -f /usr/bin/perl*
rm -f /usr/bin/s2p /usr/bin/psed
rm -f /usr/bin/pstruct /usr/bin/c2ph
- cp -vfdpR $TMPDIR/* /usr || exit 1
+ cp -vfdpR $TMPDIR/usr/* /usr || exit 1
# delete the old perl version
test -d /usr/lib/perl5/5.8.0 && rm -rf /usr/lib/perl5/5.8.0
@@ -70,7 +72,7 @@
do
pushd $EXT
echo "******** compiling perl extension $EXT ********"
- yes "" | perl Makefile.PL PREFIX=/usr || exit 1
+ yes "" | perl Makefile.PL PREFIX=/usr DESTDIR=$TMPDIR || exit 1
strip_debug
make install || exit 1
popd
@@ -87,20 +89,20 @@
mkdir -p $TMPDIR|| exit 1
make install || exit 1
copy_docs $TMPDIR
- rm $TMPDIR/bin/c2ph || exit 1
- ln -s pstruct $TMPDIR/bin/c2ph || exit 1
- rm $TMPDIR/bin/perl || exit 1
+ rm $TMPDIR/usr/bin/c2ph || exit 1
+ ln -s pstruct $TMPDIR/usr/bin/c2ph || exit 1
+ rm $TMPDIR/usr/bin/perl || exit 1
# check here if install fails, you probably upgraded to a new perl release
PERLBIN=perl5.8.5
- if [ ! -e $TMPDIR/bin/$PERLBIN ]; then
+ if [ ! -e $TMPDIR/usr/bin/$PERLBIN ]; then
echo "You need to edit the perl install script"
echo "every time you update to a new release"
exit 1
fi
- ln -sf $PERLBIN $TMPDIR/bin/perl || exit 1
+ ln -sf $PERLBIN $TMPDIR/usr/bin/perl || exit 1
- cp -dpR $TMPDIR/* $CDDIR/usr/ || exit 1
+ cp -dpR $TMPDIR/usr/* $CDDIR/usr/ || exit 1
rm -rf $TMPDIR || exit 1
# now let's take care of all the perl extension
|
