1.1 --- a/openpkg/openpkg.spec Mon Mar 28 19:41:02 2011 +0200
1.2 +++ b/openpkg/openpkg.spec Tue Mar 29 19:46:35 2011 +0200
1.3 @@ -39,7 +39,7 @@
1.4 # o any cc(1)
1.5
1.6 # the package version/release
1.7 -%define V_openpkg 20110320
1.8 +%define V_openpkg 20110322
1.9
1.10 # the used software versions
1.11 %define V_rpm 4.2.1
1.12 @@ -529,6 +529,7 @@
1.13 esac
1.14 CC="${l_cc}" \
1.15 GREP="grep" \
1.16 + MAKE="${l_make}" \
1.17 ./configure \
1.18 --cache-file=./config.cache
1.19 ${l_make} || exit $?
1.20 @@ -582,6 +583,7 @@
1.21 echo 'ac_cv_type_iconv_t=no'
1.22 ) >config.cache
1.23 CC="${l_cc}" \
1.24 + MAKE="${l_make}" \
1.25 MAKEINFO="true" \
1.26 GREP="grep" \
1.27 ./configure \
1.28 @@ -698,7 +700,8 @@
1.29 echo "ac_cv_prog_cc_g=no"
1.30 ) >config.cache
1.31 AUTOCONF="true" \
1.32 - CC="${l_cc}"
1.33 + CC="${l_cc}" \
1.34 + MAKE="${l_make}" \
1.35 ./configure \
1.36 --cache-file=./config.cache \
1.37 --prefix=%{l_prefix} \
1.38 @@ -773,6 +776,7 @@
1.39 for dir in %{l_prefix}/lib /lib64 /usr/lib64 /lib /usr/lib /usr/ccs/lib; do
1.40 [ -d $dir ] && libdirs="$libdirs $dir"
1.41 done
1.42 + PATH=$PATH:`echo "${l_make}" | sed -e 's;\(.*\)/[^/][^/]*$;\1;'` \
1.43 ./Configure \
1.44 -d -e -s \
1.45 -Dprefix=%{l_prefix} \
1.46 @@ -845,6 +849,7 @@
1.47 echo 'lt_cv_sys_max_cmd_len=100'
1.48 ) >config.cache
1.49 CC="${l_cc}" \
1.50 + MAKE="${l_make}" \
1.51 CFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
1.52 CPPFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
1.53 LDFLAGS="-L`pwd`/../zlib-%{V_zlib}" \
1.54 @@ -886,6 +891,7 @@
1.55 echo 'bc_cv_as_noexecstack=no'
1.56 ) >config.cache
1.57 CC="${l_cc}" \
1.58 + MAKE="${l_make}" \
1.59 CFLAGS="-O" \
1.60 ./configure \
1.61 --cache-file=./config.cache \
1.62 @@ -970,8 +976,16 @@
1.63 sh $shtool subst \
1.64 -e 's;\(rsavrfy(\)\(&dig->rsa_pk\);\1\2.n, \2.e;g' \
1.65 lib/signature.c
1.66 + sh $shtool subst \
1.67 + -e 's;\(^LIBS =\)[ \t]*;\1 -ldb;' \
1.68 + -e 's;\(^rpmdb_[^_][^_]*_LDFLAGS =\)[ \t]*;\1 -L$(top_srcdir)/db3;g' \
1.69 + rpmdb/Makefile.in
1.70 + sh $shtool subst \
1.71 + -e 's;\(^myLDFLAGS =\);\1 -L$(top_srcdir)/db3;' \
1.72 + Makefile.in
1.73
1.74 # configure the package
1.75 + MAKE="${l_make}" \
1.76 sh ./configure \
1.77 --cache-file=./config.cache \
1.78 --prefix=%{l_prefix} \
