Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9886
Modified Files:
Tag: rel-1-2-patches
e2fsprogs
Log Message:
make sure we install the required libs
Index: e2fsprogs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/e2fsprogs,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -d -r1.17.2.1 -r1.17.2.2
--- e2fsprogs 2 Oct 2005 20:41:00 -0000 1.17.2.1
+++ e2fsprogs 2 Oct 2005 21:51:53 -0000 1.17.2.2
@@ -35,32 +35,32 @@
make clean
#export PATH=$OLDPATH
- ./configure --prefix= --disable-nls --disable-debugfs || exit 1
- # --enable-elf-shlibs
+ ./configure --prefix= --disable-nls --disable-debugfs --enable-elf-shlibs || exit 1
make $PMAKE all || exit 1
strip_debug
# make sure the system has the actual files
- make install || exit
+ make install DESTDIR=/usr || exit
+ make install-libs DESTDIR=/usr || exit
;;
install )
- rm -rf $WORKDIR/tmp || exit 1
- mkdir -p $WORKDIR/tmp || exit 1
- make install DESTDIR=$WORKDIR/tmp || exit 1
- copy_docs $WORKDIR/tmp
- rm $WORKDIR/tmp/sbin/fsck.ext2
- rm $WORKDIR/tmp/sbin/fsck.ext3
- ln -sf e2fsck $WORKDIR/tmp/sbin/fsck.ext2
- ln -sf e2fsck $WORKDIR/tmp/sbin/fsck.ext3
- rm $WORKDIR/tmp/sbin/mkfs.ext2
- rm $WORKDIR/tmp/sbin/mkfs.ext3
- rm $WORKDIR/tmp/sbin/tune2fs
- ln -sf mke2fs $WORKDIR/tmp/sbin/mkfs.ext2
- ln -sf mke2fs $WORKDIR/tmp/sbin/mkfs.ext3
- ln -sf e2label $WORKDIR/tmp/sbin/tune2fs
- cp --remove-destination -dpR $WORKDIR/tmp/* $CDDIR || exit 1
+ rm -rf $TMPDIR || exit 1
+ mkdir -p $TMPDIR || exit 1
+ make install DESTDIR=$TMPDIR || exit 1
+ copy_docs $TMPDIR
+ rm $TMPDIR/sbin/fsck.ext2
+ rm $TMPDIR/sbin/fsck.ext3
+ ln -sf e2fsck $TMPDIR/sbin/fsck.ext2
+ ln -sf e2fsck $TMPDIR/sbin/fsck.ext3
+ rm $TMPDIR/sbin/mkfs.ext2
+ rm $TMPDIR/sbin/mkfs.ext3
+ rm $TMPDIR/sbin/tune2fs
+ ln -sf mke2fs $TMPDIR/sbin/mkfs.ext2
+ ln -sf mke2fs $TMPDIR/sbin/mkfs.ext3
+ ln -sf e2label $TMPDIR/sbin/tune2fs
+ cp --remove-destination -dpR $TMPDIR/* $CDDIR || exit 1
cp --remove-destination -dpR misc/mke2fs-static $INITRDDIR/bin/mke2fs || exit 1
- rm -rf $WORKDIR/tmp || exit 1
+ rm -rf $TMPDIR || exit 1
;;
* )
|
