From 11cb5fe3ba6eaf5fbeaf4b5439ae859f33d4ee8f Mon Sep 17 00:00:00 2001 From: Dimitar Zhekov Date: Tue, 4 May 2004 09:20:13 +0000 Subject: [PATCH] Dimitar Zhekov: fixed svgalib to abort on errors and evaluate hooks [2004042109340231802] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2830 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/jimmy/svgalib/svgalib.conf | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package/jimmy/svgalib/svgalib.conf b/package/jimmy/svgalib/svgalib.conf index 4eaba6ce7..b36e0bf17 100644 --- a/package/jimmy/svgalib/svgalib.conf +++ b/package/jimmy/svgalib/svgalib.conf @@ -22,21 +22,23 @@ svgalib_main() { - mkdir -p $root/$prefix/man/man{1,3,5,6,7,8} - + hook_eval preconf makeopt="$makeopt prefix=$root/$prefix NO_ASM= MANFORMAT=uncompressed" makeopt="$makeopt LDFLAGS=\"$LDFLAGS -s -L$root/$prefix/lib\"" makeopt="$makeopt INSTALLMODULE= INSTALLDEV=" - eval $MAKE $makeopt install - (cd kernel/svgalib_helper ; make -f Makefile.alt modules_install) + + hook_eval premake + mkdir -p $root/$prefix/man/man{1,3,5,6,7,8} + eval $MAKE $makeopt install || return + make -C kernel/svgalib_helper -f Makefile.alt modules_install || return cp -f utils/gtfcalc $root/$prefix/bin cp -f src/config/* $root/etc/vga rm -f $root/$prefix/man/man6/* - eval $MAKE $makeopt demoprogs + eval $MAKE $makeopt demoprogs || return cp -f demos/{accel,svidtune,testgl,vgatest} $root/$prefix/bin cp -f doc/man6/{accel,svidtune,testgl,vgatest}.6 $root/$prefix/man/man6 - + hook_eval postmake } custmain=svgalib_main