]> granicus.if.org Git - ejabberd/commitdiff
* src/Makefile.in: Only try to install epam if pam was enabled
authorBadlop <badlop@process-one.net>
Tue, 25 Mar 2008 18:59:45 +0000 (18:59 +0000)
committerBadlop <badlop@process-one.net>
Tue, 25 Mar 2008 18:59:45 +0000 (18:59 +0000)
in configure script (thanks to Etan Reisner)(EJAB-586)

SVN Revision: 1256

ChangeLog
src/Makefile.in

index ebe32bc8f75453284c697a50b2a7723c12d78b6e..f137e59a0432a7b27ebb0a29ce168ec45f6e7d7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2008-03-25  Badlop  <badlop@process-one.net>
 
        * src/Makefile.in: Failure to install epam is not
-       critical (EJAB-573)
+       critical (EJAB-573). Only try to install epam if pam was enabled
+       in configure script (thanks to Etan Reisner)(EJAB-586)
 
 2008-03-24  Badlop  <badlop@process-one.net>
 
index 70596536fd50482e7463d0343f4c2be478fd7cf7..fc981a4a0a470486ee74f227dc36e967a96bc736 100644 (file)
@@ -40,6 +40,11 @@ ifeq (@transient_supervisors@, false)
   ERLC_FLAGS+=-DNO_TRANSIENT_SUPERVISORS
 endif
 
+INSTALL_EPAM=
+ifeq (@pam@, pam)
+  INSTALL_EPAM=install -m 750 epam $(PBINDIR)
+endif
+
 prefix = @prefix@
 
 SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @mod_proxy65@ @eldap@ @pam@ @web@ stringprep @tls@ @odbc@ @ejabberd_zlib@
@@ -104,7 +109,7 @@ install: all
        install -d $(SODIR)
        install -d $(PBINDIR)
        install -m 644 *.so $(SODIR)
-       -install -m 750 epam $(PBINDIR)
+       $(INSTALL_EPAM)
        install -d $(MSGSDIR)
        install -m 644 msgs/*.msg $(MSGSDIR)
        install -d $(ETCDIR)