]>
Commit | Line | Data |
---|---|---|
7856cf5d AF |
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 | |
4 | @@ -781,7 +781,7 @@ | |
5 | export LIBS INCPATH | |
6 | ||
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], | |
5eab636f AF |
13 | |
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 | |
7856cf5d | 16 | @@ -60,12 +60,12 @@ |
d6f89cbe AF |
17 | %_builddir %{_topdir}/BUILD |
18 | %_buildshell /bin/sh | |
19 | %_bzip2bin @BZIP2BIN@ | |
20 | -%_dbpath %{_var}/lib/rpm | |
21 | -%_defaultdocdir %{_usr}/doc | |
09f6ceca | 22 | +%_dbpath %{_var}/state/rpm |
d6f89cbe AF |
23 | +%_defaultdocdir %{_usr}/share/doc |
24 | # | |
25 | # XXX fixowner, fixgroup, and fixperms are run at the end of hardcoded setup | |
7856cf5d AF |
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@ | |
31 | # | |
32 | %_gzipbin @GZIPBIN@ | |
33 | @@ -74,13 +74,13 @@ | |
5a076bba | 34 | %_rpmdir %{_topdir}/RPMS |
e548b810 | 35 | # |
5a076bba AF |
36 | # XXX Note escaped %% for use in headerSprintf |
37 | -%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm | |
38 | +%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm | |
39 | %_signature none | |
40 | %_sourcedir %{_topdir}/SOURCES | |
41 | %_specdir %{_topdir}/SPECS | |
42 | %_srcrpmdir %{_topdir}/SRPMS | |
43 | %_tmppath %{_var}/tmp | |
e548b810 | 44 | -%_topdir %{_usrsrc}/redhat |
5a076bba AF |
45 | +%_topdir %(echo $HOME)/rpm |
46 | # | |
47 | #============================================================================== | |
48 | # ---- Optional rpmrc macros. | |
5eab636f AF |
49 | @@ -153,14 +153,14 @@ |
50 | %_sbindir %{_exec_prefix}/sbin | |
51 | %_libexecdir %{_exec_prefix}/libexec | |
52 | %_datadir %{_prefix}/share | |
53 | -%_sysconfdir %{_prefix}/etc | |
54 | +%_sysconfdir /etc | |
55 | %_sharedstatedir %{_prefix}/com | |
56 | %_localstatedir %{_prefix}/var | |
d6f89cbe AF |
57 | %_libdir %{_exec_prefix}/lib |
58 | %_includedir %{_prefix}/include | |
59 | %_oldincludedir /usr/include | |
60 | -%_infodir %{_prefix}/include | |
61 | -%_mandir %{_prefix}/man | |
c96842a9 | 62 | +%_infodir /usr/share/info |
d6f89cbe | 63 | +%_mandir %{_prefix}/share/man |
e548b810 AF |
64 | |
65 | #============================================================================== | |
d6f89cbe | 66 | # ---- config.guess platform macros. |