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

diff --git a/camel/ChangeLog b/camel/ChangeLog
index c5b5f34..fbb1054 100644 (file)
--- 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 5cb8555..ee2e88f 100644 (file)
--- 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             \