diff -r 2289d64c2123 -r 4ecfc2416fd8 openpkg/openpkg.spec
--- a/openpkg/openpkg.spec	Mon Mar 28 19:41:02 2011 +0200
+++ b/openpkg/openpkg.spec	Tue Mar 29 19:46:35 2011 +0200
@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20110320
+%define       V_openpkg  20110322
 
 #   the used software versions
 %define       V_rpm      4.2.1
@@ -529,6 +529,7 @@
       esac
       CC="${l_cc}" \
       GREP="grep" \
+      MAKE="${l_make}" \
       ./configure \
           --cache-file=./config.cache
       ${l_make} || exit $?
@@ -582,6 +583,7 @@
         echo 'ac_cv_type_iconv_t=no'
       ) >config.cache
       CC="${l_cc}" \
+      MAKE="${l_make}" \
       MAKEINFO="true" \
       GREP="grep" \
       ./configure \
@@ -698,7 +700,8 @@
         echo "ac_cv_prog_cc_g=no"
       ) >config.cache
       AUTOCONF="true" \
-      CC="${l_cc}"
+      CC="${l_cc}" \
+      MAKE="${l_make}" \
       ./configure \
           --cache-file=./config.cache \
           --prefix=%{l_prefix} \
@@ -773,6 +776,7 @@
       for dir in %{l_prefix}/lib /lib64 /usr/lib64 /lib /usr/lib /usr/ccs/lib; do
           [ -d $dir ] && libdirs="$libdirs $dir"
       done
+      PATH=$PATH:`echo "${l_make}" | sed -e 's;\(.*\)/[^/][^/]*$;\1;'` \
       ./Configure \
           -d -e -s \
           -Dprefix=%{l_prefix} \
@@ -845,6 +849,7 @@
         echo 'lt_cv_sys_max_cmd_len=100'
       ) >config.cache
       CC="${l_cc}" \
+      MAKE="${l_make}" \
       CFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
       CPPFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
       LDFLAGS="-L`pwd`/../zlib-%{V_zlib}" \
@@ -886,6 +891,7 @@
         echo 'bc_cv_as_noexecstack=no'
       ) >config.cache
       CC="${l_cc}" \
+      MAKE="${l_make}" \
       CFLAGS="-O" \
       ./configure \
         --cache-file=./config.cache \
@@ -970,8 +976,16 @@
       sh $shtool subst \
           -e 's;\(rsavrfy(\)\(&dig->rsa_pk\);\1\2.n, \2.e;g' \
           lib/signature.c
+      sh $shtool subst \
+          -e 's;\(^LIBS =\)[ \t]*;\1 -ldb;' \
+          -e 's;\(^rpmdb_[^_][^_]*_LDFLAGS =\)[ \t]*;\1 -L$(top_srcdir)/db3;g' \
+          rpmdb/Makefile.in
+      sh $shtool subst \
+          -e 's;\(^myLDFLAGS =\);\1 -L$(top_srcdir)/db3;' \
+          Makefile.in
 
       #   configure the package
+      MAKE="${l_make}" \
       sh ./configure \
           --cache-file=./config.cache \
           --prefix=%{l_prefix} \