aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2001-09-15 03:26:23 +0800
committerJP Rosevear <jpr@src.gnome.org>2001-09-15 03:26:23 +0800
commitefa43cbf6f1e5902ea0b426eb6b7212e9096acb9 (patch)
tree5517c48f9c6faeb31f3bb05e2f78d13c7fbb74fd /camel
parentbea18b49c16fcc3a99783a4b507fc279b807bb85 (diff)
downloadgsoc2013-evolution-efa43cbf6f1e5902ea0b426eb6b7212e9096acb9.tar.gz
gsoc2013-evolution-efa43cbf6f1e5902ea0b426eb6b7212e9096acb9.tar.zst
gsoc2013-evolution-efa43cbf6f1e5902ea0b426eb6b7212e9096acb9.zip
use install hook instead of install rule to guarantee we run after
2001-09-14 JP Rosevear <jpr@ximian.com> * Makefile.am: use install hook instead of install rule to guarantee we run after installation 2001-09-14 JP Rosevear <jpr@ximian.com> * configure.in: remove unneeded conditionals svn path=/trunk/; revision=12825
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog5
-rw-r--r--camel/Makefile.am52
2 files changed, 30 insertions, 27 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index c5b5f3467f..fbb1054370 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-14 JP Rosevear <jpr@ximian.com>
+
+ * Makefile.am: use install hook instead of install rule to
+ guarantee we run after installation
+
2001-09-13 Jeffrey Stedfast <fejj@ximian.com>
* camel-filter-driver.c (camel_filter_driver_filter_folder): Don't
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 5cb85553f3..ee2e88f255 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -208,35 +208,33 @@ libcamel_static_la_LDFLAGS = --all-static
camel-lock-helper: camel-lock-helper.o camel-lock.o
$(CC) -o $@ $^ -I$(srcdir)/.. -I$(srcdir)
-if CAMEL_LOCK_HELPER_SETUID
-install-exec-local:
- @if test `whoami` = root ; then \
- chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(sbindir)/camel-lock-helper ; \
- chmod u+s $(DESTDIR)$(sbindir)/camel-lock-helper ; \
- else \
- echo '*** WARNING ***' ; \
- echo "Camel will not be able to open mbox files until you perform the following steps:" ; \
- echo " 1. Become root" ; \
- echo " 2. chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(sbindir)/camel-lock-helper" ; \
- echo " 3. chmod u+s $(DESTDIR)$(sbindir)/camel-lock-helper" ; \
- echo '*** WARNING ***' ; \
+install-exec-hook:
+ @if test -n "$(CAMEL_LOCK_HELPER_USER)"; then \
+ if test `whoami` = root ; then \
+ chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(sbindir)/camel-lock-helper ; \
+ chmod u+s $(DESTDIR)$(sbindir)/camel-lock-helper ; \
+ else \
+ echo '*** WARNING ***' ; \
+ echo "Camel will not be able to open mbox files until you perform the following steps:" ; \
+ echo " 1. Become root" ; \
+ echo " 2. chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(sbindir)/camel-lock-helper" ; \
+ echo " 3. chmod u+s $(DESTDIR)$(sbindir)/camel-lock-helper" ; \
+ echo '*** WARNING ***' ; \
+ fi \
fi
-endif
-if CAMEL_LOCK_HELPER_SETGID
-install-exec-local:
- @if test `whoami` = root ; then \
- chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper ; \
- chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper ; \
- else \
- echo '*** WARNING ***' ; \
- echo "Camel will not be able to open mbox files until you perform the following steps:" ; \
- echo " 1. Become root" ; \
- echo " 2. chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper" ; \
- echo " 3. chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper" ; \
- echo '*** WARNING ***' ; \
+ @if test -n "$(CAMEL_LOCK_HELPER_GROUP)"; then \
+ if test `whoami` = root ; then \
+ chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper ; \
+ chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper ; \
+ else \
+ echo '*** WARNING ***' ; \
+ echo "Camel will not be able to open mbox files until you perform the following steps:" ; \
+ echo " 1. Become root" ; \
+ echo " 2. chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper" ; \
+ echo " 3. chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper" ; \
+ echo '*** WARNING ***' ; \
+ fi \
fi
-endif
-
noinst_HEADERS = \
camel-charset-map-private.h \