diff --git a/archiver/bzip2/bzip2.conf b/archiver/bzip2/bzip2.conf index 07e62e058..4a351ccb6 100644 --- a/archiver/bzip2/bzip2.conf +++ b/archiver/bzip2/bzip2.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../bzip2/bzip2.conf -# Copyright (C) 2006 - 2008 The OpenSDE Project +# Copyright (C) 2006 - 2016 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -14,11 +14,13 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -var_append makeopt ' ' "AR=$AR RANLIB=$RANLIB" -var_append makeinstopt ' ' "PREFIX=/$prefix" +var_append makeopt ' ' "AR=$AR RANLIB=$RANLIB PREFIX=/$prefix" +var_append makeinstopt ' ' "PREFIX=/$prefix LIBDIR=${libdir##*/}" if [ "$SDECFG_STATIC" != 1 -a "$SDECFG_DIETLIBC_bzip2" != 1 ] ; then - hook_add inmake 5 "$MAKE $makeopt -f Makefile-libbz2_so" + hook_add premake 5 "$MAKE $makeopt -f Makefile-libbz2_so" + hook_add premake 6 "$MAKE $makeopt bzip2 bzip2recover" + hook_add postmake 5 "install libbz2.so.?.?.* $root/$libdir" hook_add postmake 5 "cp -a libbz2.so.* $root/$libdir" fi