]>
Commit | Line | Data |
---|---|---|
cd33aab7 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 @@ | |
4703c2f4 | 5 | dnl export LIBS INCPATH CONFIG_SITE |
7856cf5d AF |
6 | |
7 | AC_CONFIG_SUBDIRS(popt) | |
1e537e49 | 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 | |
3b934e94 | 10 | rpmio/Makefile lib/Makefile build/Makefile tools/Makefile |
11 | scripts/Makefile | |
7856cf5d | 12 | tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile |
cd33aab7 AM |
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 | |
fa74a11c | 15 | +++ rpm-4.0.2/macros.in Mon Apr 2 11:43:51 2001 |
1e537e49 | 16 | @@ -90,7 +90,7 @@ |
d6f89cbe | 17 | %_bzip2bin @BZIP2BIN@ |
003cac49 JR |
18 | %_dbpath %{_var}/lib/rpm |
19 | %_dbpath_rebuild %{_dbpath} | |
4703c2f4 | 20 | -%_defaultdocdir %{_usr}/doc |
d6f89cbe | 21 | +%_defaultdocdir %{_usr}/share/doc |
faecf1b6 AF |
22 | # |
23 | %__find_provides @FINDPROVIDES@ | |
24 | %__find_requires @FINDREQUIRES@ | |
1e537e49 | 25 | @@ -102,8 +102,8 @@ |
4703c2f4 AF |
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@ | |
7856cf5d AF |
33 | %_fixperms %{__chmod} -Rf @FIXPERMS@ |
34 | # | |
35 | %_gzipbin @GZIPBIN@ | |
1e537e49 | 36 | @@ -112,13 +112,13 @@ |
5a076bba | 37 | %_rpmdir %{_topdir}/RPMS |
e548b810 | 38 | # |
5a076bba AF |
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 | |
e548b810 | 47 | -%_topdir %{_usrsrc}/redhat |
5a076bba | 48 | +%_topdir %(echo $HOME)/rpm |
1e537e49 | 49 | %_unzipbin @UNZIPBIN@ |
4703c2f4 | 50 | |
5a076bba | 51 | #============================================================================== |
1e537e49 | 52 | @@ -461,15 +461,15 @@ |
5eab636f AF |
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 | |
7bd786ed SZ |
59 | -%_localstatedir %{_prefix}/var |
60 | +%_localstatedir /var | |
003cac49 JR |
61 | %_lib lib |
62 | %_libdir %{_exec_prefix}/%{_lib} | |
d6f89cbe AF |
63 | %_includedir %{_prefix}/include |
64 | %_oldincludedir /usr/include | |
9983b570 | 65 | -%_infodir %{_prefix}/info |
d6f89cbe | 66 | -%_mandir %{_prefix}/man |
7d942875 | 67 | +%_infodir /usr/share/info |
d6f89cbe | 68 | +%_mandir %{_prefix}/share/man |
e548b810 AF |
69 | |
70 | #============================================================================== | |
d6f89cbe | 71 | # ---- config.guess platform macros. |
cd33aab7 AM |
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 \\\ | |
fa74a11c | 78 | + --host=%{_target_platform} \\\ |
cd33aab7 AM |
79 | --prefix=%{_prefix} \\\ |
80 | --exec-prefix=%{_exec_prefix} \\\ | |
81 | --bindir=%{_bindir} \\\ |