1 diff -ru rpm-3.0.1.old/macros.in rpm-3.0.1/macros.in
2 --- rpm-3.0.1.old/macros.in Tue Apr 27 21:46:45 1999
3 +++ rpm-3.0.1/macros.in Fri May 7 03:24:13 1999
5 %_builddir %{_topdir}/BUILD
8 -%_dbpath %{_var}/lib/rpm
9 -%_defaultdocdir %{_usr}/doc
10 +%_dbpath %{_var}/db/rpm
11 +%_defaultdocdir %{_usr}/share/doc
13 # XXX fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
14 %_fixowner [ `%{__id} -u` = '0' ] && %{__chown} -Rf root
16 %_rpmdir %{_topdir}/RPMS
18 # XXX Note escaped %% for use in headerSprintf
19 -%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
20 +%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
22 %_sourcedir %{_topdir}/SOURCES
23 %_specdir %{_topdir}/SPECS
24 %_srcrpmdir %{_topdir}/SRPMS
26 -%_topdir %{_usrsrc}/redhat
27 +%_topdir %(echo $HOME)/rpm
29 #==============================================================================
30 # ---- Optional rpmrc macros.
32 %_libdir %{_exec_prefix}/lib
33 %_includedir %{_prefix}/include
34 %_oldincludedir /usr/include
35 -%_infodir %{_prefix}/include
36 -%_mandir %{_prefix}/man
37 +%_infodir %{_prefix}/share/info
38 +%_mandir %{_prefix}/share/man
40 #==============================================================================
41 # ---- config.guess platform macros.
42 Only in rpm-3.0.1: macros.in~