diff -r -u /usr/old.orig/lib/rpm/macros /usr/old/lib/rpm/macros
--- /usr/old.orig/lib/rpm/macros	Sun Apr  6 12:04:30 2003
+++ /usr/old/lib/rpm/macros	Sat Apr  5 19:02:46 2003
@@ -17,9 +17,9 @@
 #==============================================================================
 # ---- filesystem macros.
 #
-%_usr			/usr/old
+%_usr			/usr
 %_usrsrc		%{_usr}/src
-%_var			/var/old
+%_var			/var
 
 #==============================================================================
 # ---- Generally useful path macros.
@@ -228,9 +228,11 @@
 %{?buildroot:RPM_BUILD_ROOT=\"%{buildroot}\"\
 export RPM_BUILD_ROOT}
 
-%___build_shell		%{?_buildshell:%{_buildshell}}%{!?_buildshell:/bin/sh}
+#%___build_shell		%{?_buildshell:%{_buildshell}}%{!?_buildshell:/bin/sh}
+%___build_shell		/bin/sh
 %___build_args		-e
-%___build_cmd		%{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} }%{___build_shell} %{___build_args}
+#%___build_cmd		%{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} }%{___build_shell} %{___build_args}
+%___build_cmd		/bin/sh
 %___build_pre	\
 RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\
 RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
@@ -372,7 +374,7 @@
 # ---- configure macros.
 #	Macro(s) slavishly copied from autoconf's config.status.
 #
-%_prefix		/usr/old
+%_prefix		/usr/local
 %_exec_prefix		%{_prefix}
 %_bindir		%{_exec_prefix}/bin
 %_sbindir		%{_exec_prefix}/sbin
diff -r -u /usr/old.orig/lib/rpm/rpmrc /usr/old/lib/rpm/rpmrc
--- /usr/old.orig/lib/rpm/rpmrc	Sun Apr  6 12:04:30 2003
+++ /usr/old/lib/rpm/rpmrc	Sat Apr  5 18:53:36 2003
@@ -257,5 +257,5 @@
 buildarch_compat: milan: m68kmint noarch
 buildarch_compat: hades: m68kmint noarch
 
-macrofiles:	/usr/old/lib/rpm/macros:/usr/old/lib/rpm/%{_target}/macros:/etc/rpm/macros.specspo:/etc/rpm/macros:/etc/rpm/%{_target}/macros:~/.rpmmacros
+macrofiles:	/usr/old/lib/rpm/macros:/usr/old/lib/rpm/%{_target}/macros:~/.rpmmacros
 
diff -r -u /usr/old.orig/lib/rpmrc /usr/old/lib/rpmrc
--- /usr/old.orig/lib/rpmrc	Sun Apr  6 12:04:30 2003
+++ /usr/old/lib/rpmrc	Sat Apr  5 18:53:36 2003
@@ -257,5 +257,5 @@
 buildarch_compat: milan: m68kmint noarch
 buildarch_compat: hades: m68kmint noarch
 
-macrofiles:	/usr/old/lib/rpm/macros:/usr/old/lib/rpm/%{_target}/macros:/etc/rpm/macros.specspo:/etc/rpm/macros:/etc/rpm/%{_target}/macros:~/.rpmmacros
+macrofiles:	/usr/old/lib/rpm/macros:/usr/old/lib/rpm/%{_target}/macros:~/.rpmmacros