1 --- rpm-3.0.3/configure.in.wiget Thu Sep 30 23:25:29 1999
2 +++ rpm-3.0.3/configure.in Fri Oct 29 11:43:58 1999
4 export LIBS INCPATH CONFIG_SITE
6 AC_CONFIG_SUBDIRS(popt)
7 -AC_OUTPUT([Makefile rpmrc macros lib/Makefile
8 +AC_OUTPUT([Makefile rpmrc macros macros.pld lib/Makefile
9 build/Makefile tools/Makefile scripts/Makefile
10 tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
11 misc/Makefile po/Makefile.in intl/Makefile
12 --- rpm-3.0.3/macros.in.wiget Thu Sep 30 01:29:57 1999
13 +++ rpm-3.0.3/macros.in Fri Oct 29 11:50:10 1999
15 %_builddir %{_topdir}/BUILD
18 -%_dbpath %{_var}/lib/rpm
19 -%_defaultdocdir %{_usr}/doc
20 +%_dbpath %{_var}/state/rpm
21 +%_defaultdocdir %{_usr}/share/doc
23 %__find_provides @FINDPROVIDES@
24 %__find_requires @FINDREQUIRES@
26 #%__find_obsoletes ???
28 # XXX fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
29 -%_fixowner [ `%{__id} -u` = '0' ] && %{__chown} -Rhf root
30 -%_fixgroup [ `%{__id} -u` = '0' ] && %{__chgrp} -Rhf @ROOT_GROUP@
31 +%_fixowner [ `%{__id} -u` = '0' ] && %{__chown} -Rhf root.@ROOT_GROUP@
32 +#%_fixgroup [ `%{__id} -u` = '0' ] && %{__chgrp} -Rhf @ROOT_GROUP@
33 %_fixperms %{__chmod} -Rf @FIXPERMS@
37 %_rpmdir %{_topdir}/RPMS
39 # XXX Note escaped %% for use in headerSprintf
40 -%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
41 +%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
43 %_sourcedir %{_topdir}/SOURCES
44 %_specdir %{_topdir}/SPECS
45 %_srcrpmdir %{_topdir}/SRPMS
47 -%_topdir %{_usrsrc}/redhat
48 +%_topdir %(echo $HOME)/rpm
50 #==============================================================================
51 # ---- Optional rpmrc macros.
53 %_sbindir %{_exec_prefix}/sbin
54 %_libexecdir %{_exec_prefix}/libexec
55 %_datadir %{_prefix}/share
56 -%_sysconfdir %{_prefix}/etc
58 %_sharedstatedir %{_prefix}/com
59 %_localstatedir %{_prefix}/var
60 %_libdir %{_exec_prefix}/lib
61 %_includedir %{_prefix}/include
62 %_oldincludedir /usr/include
63 -%_infodir %{_prefix}/info
64 -%_mandir %{_prefix}/man
65 +%_infodir %{_prefix}/share/info
66 +%_mandir %{_prefix}/share/man
68 #==============================================================================
69 # ---- config.guess platform macros.