1 diff -ur rpm-3.0.1.old/configure.in rpm-3.0.1/configure.in
2 --- rpm-3.0.1.old/configure.in Fri Jun 4 18:21:31 1999
3 +++ rpm-3.0.1/configure.in Fri Jun 4 18:22:00 1999
7 AC_CONFIG_SUBDIRS(popt)
8 -AC_OUTPUT([Makefile rpmrc macros lib/Makefile
9 +AC_OUTPUT([Makefile rpmrc macros macros.pld lib/Makefile
10 build/Makefile tools/Makefile scripts/Makefile
11 tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
12 misc/Makefile po/Makefile.in intl/Makefile],
14 --- rpm-3.0.2/macros.in.macros Fri May 14 20:59:43 1999
15 +++ rpm-3.0.2/macros.in Tue Jul 20 12:44:52 1999
17 %_builddir %{_topdir}/BUILD
20 -%_dbpath %{_var}/lib/rpm
21 -%_defaultdocdir %{_usr}/doc
22 +%_dbpath %{_var}/state/rpm
23 +%_defaultdocdir %{_usr}/share/doc
25 # XXX fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
26 -%_fixowner [ `%{__id} -u` = '0' ] && %{__chown} -Rf root
27 -%_fixgroup [ `%{__id} -u` = '0' ] && %{__chgrp} -Rf @ROOT_GROUP@
28 +%_fixowner [ `%{__id} -u` = '0' ] && %{__chown} -Rf root.@ROOT_GROUP@
29 +#%_fixgroup [ `%{__id} -u` = '0' ] && %{__chgrp} -Rf @ROOT_GROUP@
30 %_fixperms %{__chmod} -Rf @FIXPERMS@
34 %_rpmdir %{_topdir}/RPMS
36 # XXX Note escaped %% for use in headerSprintf
37 -%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
38 +%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
40 %_sourcedir %{_topdir}/SOURCES
41 %_specdir %{_topdir}/SPECS
42 %_srcrpmdir %{_topdir}/SRPMS
44 -%_topdir %{_usrsrc}/redhat
45 +%_topdir %(echo $HOME)/rpm
47 #==============================================================================
48 # ---- Optional rpmrc macros.
50 %_sbindir %{_exec_prefix}/sbin
51 %_libexecdir %{_exec_prefix}/libexec
52 %_datadir %{_prefix}/share
53 -%_sysconfdir %{_prefix}/etc
55 %_sharedstatedir %{_prefix}/com
56 %_localstatedir %{_prefix}/var
57 %_libdir %{_exec_prefix}/lib
58 %_includedir %{_prefix}/include
59 %_oldincludedir /usr/include
60 -%_infodir %{_prefix}/include
61 -%_mandir %{_prefix}/man
62 +%_infodir /usr/share/info
63 +%_mandir %{_prefix}/share/man
65 #==============================================================================
66 # ---- config.guess platform macros.