|
Lines 1-10
Link Here
|
| 1 |
Avoid chown before install, to avoid using root. |
1 |
--- Makefile.in.orig 2014-02-05 15:08:23.000000000 +0100 |
| 2 |
|
2 |
+++ Makefile.in 2014-03-14 10:42:06.143965800 +0100 |
| 3 |
createddirs is read in Makefile and processed there |
3 |
@@ -639,12 +639,7 @@ |
| 4 |
|
|
|
| 5 |
--- Makefile.in.orig 2013-02-05 14:57:30.000000000 +0000 |
| 6 |
+++ Makefile.in 2014-01-01 20:07:50.489335639 +0000 |
| 7 |
@@ -631,12 +631,9 @@ |
| 8 |
$(spooldir)/moderation $(spooldir)/expire $(spooldir)/auth \ |
4 |
$(spooldir)/moderation $(spooldir)/expire $(spooldir)/auth \ |
| 9 |
$(spooldir)/outgoing $(spooldir)/tmp $(spooldir)/task \ |
5 |
$(spooldir)/outgoing $(spooldir)/tmp $(spooldir)/task \ |
| 10 |
$(bouncedir) $(arcdir) $(piddir) $(staticdir) $(sysconfdir); do \ |
6 |
$(bouncedir) $(arcdir) $(piddir) $(staticdir) $(sysconfdir); do \ |
|
Lines 15-26
Link Here
|
| 15 |
- chown $(USER) $(DESTDIR)$$dir || /bin/true; \ |
11 |
- chown $(USER) $(DESTDIR)$$dir || /bin/true; \ |
| 16 |
- chgrp $(GROUP) $(DESTDIR)$$dir || /bin/true; \ |
12 |
- chgrp $(GROUP) $(DESTDIR)$$dir || /bin/true; \ |
| 17 |
+ echo "$${dir}" >> createddirs; \ |
13 |
+ echo "$${dir}" >> createddirs; \ |
| 18 |
+ \ |
|
|
| 19 |
+ \ |
| 20 |
done |
14 |
done |
| 21 |
|
15 |
|
| 22 |
installconfig: installdir |
16 |
installconfig: installdir |
| 23 |
@@ -668,8 +665,6 @@ |
17 |
@@ -676,27 +671,12 @@ |
| 24 |
echo "# automatically created file" >> data_structure.version; \ |
18 |
echo "# automatically created file" >> data_structure.version; \ |
| 25 |
echo "# you should not modify it" >> data_structure.version; \ |
19 |
echo "# you should not modify it" >> data_structure.version; \ |
| 26 |
echo $(VERSION) >> data_structure.version; \ |
20 |
echo $(VERSION) >> data_structure.version; \ |
|
Lines 27-31
Link Here
|
| 27 |
- chown $(USER) data_structure.version || /bin/true; \ |
21 |
- chown $(USER) data_structure.version || /bin/true; \ |
| 28 |
- chgrp $(GROUP) data_structure.version || /bin/true; \ |
22 |
- chgrp $(GROUP) data_structure.version || /bin/true; \ |
| 29 |
fi |
23 |
fi |
|
|
24 |
@for dir in create_list_templates families \ |
| 25 |
global_task_models list_task_models scenari search_filters \ |
| 26 |
mail_tt2 web_tt2; do \ |
| 27 |
- if [ ! -d $(DESTDIR)$(sysconfdir)/$$dir ] ; then \ |
| 28 |
- echo "Creating $(DESTDIR)$(sysconfdir)/$$dir"; \ |
| 29 |
- install -d -m 755 $(DESTDIR)$(sysconfdir)/$$dir; \ |
| 30 |
- fi; \ |
| 31 |
- chown $(USER) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \ |
| 32 |
- chgrp $(GROUP) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \ |
| 33 |
+ echo "$(DESTDIR)$(sysconfdir)/$${dir}" >> createddirs; \ |
| 34 |
done |
| 35 |
- @if [ ! -e $(DESTDIR)$(sysconfdir)/README ]; then \ |
| 36 |
- echo "Creating $(DESTDIR)$(sysconfdir)/README"; \ |
| 37 |
- $(SED) \ |
| 38 |
- -e 's|--sysconfdir--|$(sysconfdir)|' \ |
| 39 |
- -e 's|--defaultdir--|$(defaultdir)|' \ |
| 40 |
- etc_README > $(DESTDIR)$(sysconfdir)/README; \ |
| 41 |
- chmod 444 $(DESTDIR)$(sysconfdir)/README; \ |
| 42 |
- fi |
| 30 |
|
43 |
|
| 31 |
nextstep: |
44 |
nextstep: |
|
|
45 |
@echo "" |