-diff -urN rpm-3.0.5.orig/configure.in rpm-3.0.5/configure.in
---- rpm-3.0.5.orig/configure.in Sun Jul 16 21:02:26 2000
-+++ rpm-3.0.5/configure.in Sat Jul 29 23:58:18 2000
-@@ -913,7 +913,7 @@
+diff -urN rpm-4.0.2.org/configure.in rpm-4.0.2/configure.in
+--- rpm-4.0.2.org/configure.in Mon Apr 2 10:12:52 2001
++++ rpm-4.0.2/configure.in Mon Apr 2 10:29:49 2001
+@@ -1085,7 +1085,7 @@
dnl export LIBS INCPATH CONFIG_SITE
AC_CONFIG_SUBDIRS(popt)
--AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat
-+AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt scripts/brp-redhat
- lib/Makefile build/Makefile tools/Makefile scripts/Makefile
+-AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec scripts/brp-redhat
++AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt rpm.spec scripts/brp-redhat
+ rpmio/Makefile lib/Makefile build/Makefile tools/Makefile
+ scripts/Makefile
tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
- misc/Makefile po/Makefile.in intl/Makefile
-diff -urN rpm-3.0.5.orig/macros.in rpm-3.0.5/macros.in
---- rpm-3.0.5.orig/macros.in Sun Jul 9 17:35:56 2000
-+++ rpm-3.0.5/macros.in Sat Jul 29 23:59:21 2000
-@@ -82,7 +82,7 @@
+diff -urN rpm-4.0.2.org/macros.in rpm-4.0.2/macros.in
+--- rpm-4.0.2.org/macros.in Mon Apr 2 10:12:52 2001
++++ rpm-4.0.2/macros.in Mon Apr 2 11:43:51 2001
+@@ -90,7 +90,7 @@
%_bzip2bin @BZIP2BIN@
%_dbpath %{_var}/lib/rpm
%_dbpath_rebuild %{_dbpath}
#
%__find_provides @FINDPROVIDES@
%__find_requires @FINDREQUIRES@
-@@ -94,8 +94,8 @@
+@@ -102,8 +102,8 @@
%__id_u @__ID_U@
%__chown_Rhf @__CHOWN_RHF@
%__chgrp_Rhf @__CHGRP_RHF@
%_fixperms %{__chmod} -Rf @FIXPERMS@
#
%_gzipbin @GZIPBIN@
-@@ -104,13 +104,13 @@
+@@ -112,13 +112,13 @@
%_rpmdir %{_topdir}/RPMS
#
# XXX Note escaped %% for use in headerSprintf
%_tmppath %{_var}/tmp
-%_topdir %{_usrsrc}/redhat
+%_topdir %(echo $HOME)/rpm
+ %_unzipbin @UNZIPBIN@
#==============================================================================
- # ---- Optional rpmrc macros.
-@@ -401,15 +401,15 @@
+@@ -461,15 +461,15 @@
%_sbindir %{_exec_prefix}/sbin
%_libexecdir %{_exec_prefix}/libexec
%_datadir %{_prefix}/share
-%_sysconfdir %{_prefix}/etc
+%_sysconfdir /etc
%_sharedstatedir %{_prefix}/com
- %_localstatedir %{_prefix}/var
+-%_localstatedir %{_prefix}/var
++%_localstatedir /var
%_lib lib
%_libdir %{_exec_prefix}/%{_lib}
%_includedir %{_prefix}/include
%_oldincludedir /usr/include
-%_infodir %{_prefix}/info
-%_mandir %{_prefix}/man
-+%_infodir %{_prefix}/share/info
++%_infodir /usr/share/info
+%_mandir %{_prefix}/share/man
#==============================================================================
# ---- config.guess platform macros.
+@@ -518,7 +518,8 @@
+ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
+ %{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force} ; \
+-./configure %{_target_platform} \\\
++./configure \\\
++ --host=%{_target_platform} \\\
+ --prefix=%{_prefix} \\\
+ --exec-prefix=%{_exec_prefix} \\\
+ --bindir=%{_bindir} \\\