]>
Commit | Line | Data |
---|---|---|
4c3b58ea AM |
1 | diff -urN rpm-4.0.2.org/configure.in rpm-4.0.2/configure.in |
2 | --- rpm-4.0.2.org/configure.in Mon Apr 2 10:12:52 2001 | |
3 | +++ rpm-4.0.2/configure.in Mon Apr 2 10:29:49 2001 | |
4 | @@ -1085,7 +1085,7 @@ | |
5 | dnl export LIBS INCPATH CONFIG_SITE | |
6 | ||
7 | AC_CONFIG_SUBDIRS(popt) | |
8 | -AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec scripts/brp-redhat | |
9 | +AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt rpm.spec scripts/brp-redhat | |
10 | rpmio/Makefile lib/Makefile build/Makefile tools/Makefile | |
11 | scripts/Makefile | |
12 | tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile | |
13 | diff -urN rpm-4.0.2.org/macros.in rpm-4.0.2/macros.in | |
14 | --- rpm-4.0.2.org/macros.in Mon Apr 2 10:12:52 2001 | |
15 | +++ rpm-4.0.2/macros.in Mon Apr 2 10:30:19 2001 | |
16 | @@ -90,7 +90,7 @@ | |
17 | %_bzip2bin @BZIP2BIN@ | |
18 | %_dbpath %{_var}/lib/rpm | |
19 | %_dbpath_rebuild %{_dbpath} | |
20 | -%_defaultdocdir %{_usr}/doc | |
21 | +%_defaultdocdir %{_usr}/share/doc | |
22 | # | |
23 | %__find_provides @FINDPROVIDES@ | |
24 | %__find_requires @FINDREQUIRES@ | |
25 | @@ -102,8 +102,8 @@ | |
26 | %__id_u @__ID_U@ | |
27 | %__chown_Rhf @__CHOWN_RHF@ | |
28 | %__chgrp_Rhf @__CHGRP_RHF@ | |
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@ | |
34 | # | |
35 | %_gzipbin @GZIPBIN@ | |
36 | @@ -112,13 +112,13 @@ | |
37 | %_rpmdir %{_topdir}/RPMS | |
38 | # | |
39 | # XXX Note escaped %% for use in headerSprintf | |
40 | -%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm | |
41 | +%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm | |
42 | %_signature none | |
43 | %_sourcedir %{_topdir}/SOURCES | |
44 | %_specdir %{_topdir}/SPECS | |
45 | %_srcrpmdir %{_topdir}/SRPMS | |
46 | %_tmppath %{_var}/tmp | |
47 | -%_topdir %{_usrsrc}/redhat | |
48 | +%_topdir %(echo $HOME)/rpm | |
49 | %_unzipbin @UNZIPBIN@ | |
50 | ||
51 | #============================================================================== | |
52 | @@ -461,15 +461,15 @@ | |
53 | %_sbindir %{_exec_prefix}/sbin | |
54 | %_libexecdir %{_exec_prefix}/libexec | |
55 | %_datadir %{_prefix}/share | |
56 | -%_sysconfdir %{_prefix}/etc | |
57 | +%_sysconfdir /etc | |
58 | %_sharedstatedir %{_prefix}/com | |
59 | -%_localstatedir %{_prefix}/var | |
60 | +%_localstatedir /var | |
61 | %_lib lib | |
62 | %_libdir %{_exec_prefix}/%{_lib} | |
63 | %_includedir %{_prefix}/include | |
64 | %_oldincludedir /usr/include | |
65 | -%_infodir %{_prefix}/info | |
66 | -%_mandir %{_prefix}/man | |
67 | +%_infodir /usr/share/info | |
68 | +%_mandir %{_prefix}/share/man | |
69 | ||
70 | #============================================================================== | |
71 | # ---- config.guess platform macros. | |
72 | @@ -518,7 +518,8 @@ | |
73 | CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ | |
74 | FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \ | |
75 | %{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force} ; \ | |
76 | -./configure %{_target_platform} \\\ | |
77 | +./configure \\\ | |
78 | + --host=%{_host} \\\ | |
79 | --prefix=%{_prefix} \\\ | |
80 | --exec-prefix=%{_exec_prefix} \\\ | |
81 | --bindir=%{_bindir} \\\ |