-diff -Nur rpm-3.0.1/macros.in rpm-3.0.1.pld/macros.in
---- rpm-3.0.1/macros.in Tue May 11 11:24:08 1999
-+++ rpm-3.0.1.pld/macros.in Mon May 17 20:07:52 1999
-@@ -55,8 +55,8 @@
- %_builddir %{_topdir}/BUILD
- %_buildshell /bin/sh
- %_bzip2bin @BZIP2BIN@
--%_dbpath %{_var}/lib/rpm
--%_defaultdocdir %{_usr}/doc
-+%_dbpath %{_var}/db/rpm
-+%_defaultdocdir %{_usr}/share/doc
+--- rpm-4.0.2/macros.in.wiget Mon Dec 11 19:40:56 2000
++++ rpm-4.0.2/macros.in Fri Aug 10 12:20:45 2001
+@@ -476,17 +476,14 @@
+ # Macro(s) similar to the tokens used by configure.
#
- # XXX fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
- %_fixowner [ `%{__id} -u` = '0' ] && %{__chown} -Rf root
-@@ -69,13 +69,13 @@
- %_rpmdir %{_topdir}/RPMS
- #
- # XXX Note escaped %% for use in headerSprintf
--%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
-+%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
- %_signature none
- %_sourcedir %{_topdir}/SOURCES
- %_specdir %{_topdir}/SPECS
- %_srcrpmdir %{_topdir}/SRPMS
- %_tmppath %{_var}/tmp
--%_topdir %{_usrsrc}/redhat
-+%_topdir %(echo $HOME)/rpm
- #
- #==============================================================================
- # ---- Optional rpmrc macros.
-@@ -107,7 +107,7 @@
- # will be used if the per-platform macro file does not exist..
- #
- %_arch @RPMCANONARCH@
--%_vendor @RPMCANONVENDOR@
-+%_vendor pld
- %_os @RPMCANONOS@
- %_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}
- #
-@@ -154,8 +154,8 @@
- %_libdir %{_exec_prefix}/lib
- %_includedir %{_prefix}/include
- %_oldincludedir /usr/include
--%_infodir %{_prefix}/include
--%_mandir %{_prefix}/man
-+%_infodir %{_prefix}/share/info
-+%_mandir %{_prefix}/share/man
-
- #==============================================================================
- # ---- config.guess platform macros.
+ %_build %{_host}
+-%_build_alias %{_host_alias}
+ %_build_cpu %{_host_cpu}
+ %_build_vendor %{_host_vendor}
+ %_build_os %{_host_os}
+ %_host @host@
+-%_host_alias @host_alias@
+ %_host_cpu @host_cpu@
+ %_host_vendor @host_vendor@
+ %_host_os @host_os@
+ %_target %{_host}
+-%_target_alias %{_host_alias}
+ %_target_cpu %{_host_cpu}
+ %_target_vendor %{_host_vendor}
+ %_target_os %{_host_os}