Contents of /trunk/dovecot/patches/dovecot-1.2.10-config-install.patch
Parent Directory | Revision Log
Revision 1001 -
(show annotations)
(download)
Thu Mar 4 15:37:41 2010 UTC (14 years, 6 months ago) by niro
File size: 2128 byte(s)
Thu Mar 4 15:37:41 2010 UTC (14 years, 6 months ago) by niro
File size: 2128 byte(s)
-re-diffed patches
1 | diff -Naur dovecot-1.2.10/doc/Makefile.am dovecot-1.2.10-magellan/doc/Makefile.am |
2 | --- dovecot-1.2.10/doc/Makefile.am 2010-01-19 12:56:56.000000000 +0100 |
3 | +++ dovecot-1.2.10-magellan/doc/Makefile.am 2010-03-04 15:59:02.000000000 +0100 |
4 | @@ -11,11 +11,7 @@ |
5 | endif |
6 | |
7 | confdir = $(sysconfdir) |
8 | -conf_DATA = \ |
9 | - dovecot-db-example.conf \ |
10 | - dovecot-dict-sql-example.conf \ |
11 | - dovecot-ldap-example.conf \ |
12 | - dovecot-sql-example.conf |
13 | +conf_DATA = |
14 | |
15 | EXTRA_DIST = \ |
16 | dovecot-initd.sh \ |
17 | diff -Naur dovecot-1.2.10/doc/Makefile.in dovecot-1.2.10-magellan/doc/Makefile.in |
18 | --- dovecot-1.2.10/doc/Makefile.in 2010-01-25 00:32:06.000000000 +0100 |
19 | +++ dovecot-1.2.10-magellan/doc/Makefile.in 2010-03-04 15:59:24.000000000 +0100 |
20 | @@ -272,11 +272,7 @@ |
21 | |
22 | @BUILD_DOCS_TRUE@doc_DATA = $(docfiles) |
23 | confdir = $(sysconfdir) |
24 | -conf_DATA = \ |
25 | - dovecot-db-example.conf \ |
26 | - dovecot-dict-sql-example.conf \ |
27 | - dovecot-ldap-example.conf \ |
28 | - dovecot-sql-example.conf |
29 | +conf_DATA = |
30 | |
31 | EXTRA_DIST = \ |
32 | dovecot-initd.sh \ |
33 | diff -Naur dovecot-1.2.10/Makefile.in dovecot-1.2.10-magellan/Makefile.in |
34 | --- dovecot-1.2.10/Makefile.in 2010-01-25 00:32:11.000000000 +0100 |
35 | +++ dovecot-1.2.10-magellan/Makefile.in 2010-03-04 16:06:04.000000000 +0100 |
36 | @@ -380,8 +380,8 @@ |
37 | echo "$$d$$p"; \ |
38 | done | $(am__base_list) | \ |
39 | while read files; do \ |
40 | - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(confdir)'"; \ |
41 | - $(INSTALL_DATA) $$files "$(DESTDIR)$(confdir)" || exit $$?; \ |
42 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(confdir)/dovecot.conf'"; \ |
43 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(confdir)/dovecot.conf" || exit $$?; \ |
44 | done |
45 | |
46 | uninstall-confDATA: |
47 | @@ -389,8 +389,8 @@ |
48 | @list='$(conf_DATA)'; test -n "$(confdir)" || list=; \ |
49 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
50 | test -n "$$files" || exit 0; \ |
51 | - echo " ( cd '$(DESTDIR)$(confdir)' && rm -f" $$files ")"; \ |
52 | - cd "$(DESTDIR)$(confdir)" && rm -f $$files |
53 | + echo " ( cd '$(DESTDIR)$(confdir)' && rm -f" dovecot.conf ")"; \ |
54 | + cd "$(DESTDIR)$(confdir)" && rm -f dovecot.conf |
55 | install-pkglibDATA: $(pkglib_DATA) |
56 | @$(NORMAL_INSTALL) |
57 | test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" |