1 --- rpm-3.0.4/configure.in.wiget Wed Mar 15 13:29:09 2000
2 +++ rpm-3.0.4/configure.in Wed Mar 22 17:30:33 2000
4 dnl export LIBS INCPATH CONFIG_SITE
6 AC_CONFIG_SUBDIRS(popt)
7 -AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat
8 +AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt scripts/brp-redhat
9 lib/Makefile 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.4/macros.in.wiget Thu Mar 9 19:13:03 2000
13 +++ rpm-3.0.4/macros.in Wed Mar 22 17:33:43 2000
15 %_builddir %{_topdir}/BUILD
18 -%_dbpath %{_var}/lib/rpm
19 +%_dbpath %{_var}/lib/rpm
20 %_rebuilddbpath %{_dbpath}
21 -%_defaultdocdir %{_usr}/doc
22 +%_defaultdocdir %{_usr}/share/doc
24 %__find_provides @FINDPROVIDES@
25 %__find_requires @FINDREQUIRES@
28 %__chown_Rhf @__CHOWN_RHF@
29 %__chgrp_Rhf @__CHGRP_RHF@
30 -%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root
31 -%_fixgroup [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} @ROOT_GROUP@
32 +%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root.@ROOT_GROUP@
33 +#%_fixgroup [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} @ROOT_GROUP@
34 %_fixperms %{__chmod} -Rf @FIXPERMS@
38 %_rpmdir %{_topdir}/RPMS
40 # XXX Note escaped %% for use in headerSprintf
41 -%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
42 +%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
44 %_sourcedir %{_topdir}/SOURCES
45 %_specdir %{_topdir}/SPECS
46 %_srcrpmdir %{_topdir}/SRPMS
48 -%_topdir %{_usrsrc}/redhat
49 +%_topdir %(echo $HOME)/rpm
51 #==============================================================================
52 # ---- Optional rpmrc macros.
54 %_sbindir %{_exec_prefix}/sbin
55 %_libexecdir %{_exec_prefix}/libexec
56 %_datadir %{_prefix}/share
57 -%_sysconfdir %{_prefix}/etc
59 %_sharedstatedir %{_prefix}/com
60 %_localstatedir %{_prefix}/var
61 %_libdir %{_exec_prefix}/lib
62 %_includedir %{_prefix}/include
63 %_oldincludedir /usr/include
64 -%_infodir %{_prefix}/info
65 -%_mandir %{_prefix}/man
66 +%_infodir %{_prefix}/share/info
67 +%_mandir %{_prefix}/share/man
69 #==============================================================================
70 # ---- config.guess platform macros.