]>
Commit | Line | Data |
---|---|---|
4703c2f4 AF |
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 | |
3 | @@ -932,7 +932,7 @@ | |
4 | dnl export LIBS INCPATH CONFIG_SITE | |
7856cf5d AF |
5 | |
6 | AC_CONFIG_SUBDIRS(popt) | |
4703c2f4 AF |
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 | |
7856cf5d | 10 | tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile |
faecf1b6 | 11 | misc/Makefile po/Makefile.in intl/Makefile |
4703c2f4 AF |
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 | |
14 | @@ -80,9 +80,9 @@ | |
d6f89cbe AF |
15 | %_builddir %{_topdir}/BUILD |
16 | %_buildshell /bin/sh | |
17 | %_bzip2bin @BZIP2BIN@ | |
18 | -%_dbpath %{_var}/lib/rpm | |
93ae380f | 19 | +%_dbpath %{_var}/lib/rpm |
4703c2f4 AF |
20 | %_rebuilddbpath %{_dbpath} |
21 | -%_defaultdocdir %{_usr}/doc | |
d6f89cbe | 22 | +%_defaultdocdir %{_usr}/share/doc |
faecf1b6 AF |
23 | # |
24 | %__find_provides @FINDPROVIDES@ | |
25 | %__find_requires @FINDREQUIRES@ | |
4703c2f4 AF |
26 | @@ -94,8 +94,8 @@ |
27 | %__id_u @__ID_U@ | |
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@ | |
7856cf5d AF |
34 | %_fixperms %{__chmod} -Rf @FIXPERMS@ |
35 | # | |
36 | %_gzipbin @GZIPBIN@ | |
4703c2f4 | 37 | @@ -104,13 +104,13 @@ |
5a076bba | 38 | %_rpmdir %{_topdir}/RPMS |
e548b810 | 39 | # |
5a076bba AF |
40 | # XXX Note escaped %% for use in headerSprintf |
41 | -%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm | |
42 | +%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm | |
43 | %_signature none | |
44 | %_sourcedir %{_topdir}/SOURCES | |
45 | %_specdir %{_topdir}/SPECS | |
46 | %_srcrpmdir %{_topdir}/SRPMS | |
47 | %_tmppath %{_var}/tmp | |
e548b810 | 48 | -%_topdir %{_usrsrc}/redhat |
5a076bba | 49 | +%_topdir %(echo $HOME)/rpm |
4703c2f4 | 50 | |
5a076bba AF |
51 | #============================================================================== |
52 | # ---- Optional rpmrc macros. | |
4703c2f4 | 53 | @@ -384,14 +384,14 @@ |
5eab636f AF |
54 | %_sbindir %{_exec_prefix}/sbin |
55 | %_libexecdir %{_exec_prefix}/libexec | |
56 | %_datadir %{_prefix}/share | |
57 | -%_sysconfdir %{_prefix}/etc | |
58 | +%_sysconfdir /etc | |
59 | %_sharedstatedir %{_prefix}/com | |
60 | %_localstatedir %{_prefix}/var | |
d6f89cbe AF |
61 | %_libdir %{_exec_prefix}/lib |
62 | %_includedir %{_prefix}/include | |
63 | %_oldincludedir /usr/include | |
9983b570 | 64 | -%_infodir %{_prefix}/info |
d6f89cbe | 65 | -%_mandir %{_prefix}/man |
9983b570 | 66 | +%_infodir %{_prefix}/share/info |
d6f89cbe | 67 | +%_mandir %{_prefix}/share/man |
e548b810 AF |
68 | |
69 | #============================================================================== | |
d6f89cbe | 70 | # ---- config.guess platform macros. |