aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog5
-rw-r--r--camel/Makefile.am12
2 files changed, 15 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index f675609e64..1fdae99c0f 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-18 Dan Winship <danw@ximian.com>
+
+ * Makefile.am (install-exec-local): Set camel-lock-help setgid or
+ setuid as needed
+
2001-06-18 Not Zed <NotZed@Ximian.com>
* camel-folder-summary.c
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 4636447f57..4c2d34261a 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -199,9 +199,17 @@ libcamel_la_LIBADD = $(top_builddir)/e-util/libeutil.la \
camel-lock-helper: camel-lock-helper.o camel-lock.o
$(CC) -o $@ $^ -I$(srcdir)/.. -I$(srcdir)
+if CAMEL_LOCK_HELPER_SETUID
install-exec-local:
- -file=$(DESTDIR)$(sbindir)/camel-lock-helper; \
- chown root $$file && chgrp root $$file && chmod u+s $$file
+ chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(sbindir)/camel-lock-helper
+ chmod u+s $(DESTDIR)$(sbindir)/camel-lock-helper
+endif
+if CAMEL_LOCK_HELPER_SETGID
+install-exec-local:
+ chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper
+ chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper
+endif
+
noinst_HEADERS = \
camel-charset-map-private.h \