diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2008-04-02 14:24:18 +0000 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2008-04-02 14:24:18 +0000 |
| commit | f0ee4f999d5bf00df9fae7fdff30e1161aef636f (patch) | |
| tree | 6eccf1fae8c5905f8dae5c65aa9005f336a3a7e9 | |
| parent | add condition inclusion of pep in disco identity (EJAB-564) (diff) | |
Do not ignore values passed from configure (EJAB-592)
SVN Revision: 1272
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/Makefile.in | 9 |
2 files changed, 8 insertions, 4 deletions
@@ -3,6 +3,9 @@ * src/mod_pubsub/mod_pubsub.erl: add condition inclusion of pep in disco identity (EJAB-564) + * src/Makefile.in: Do not ignore values passed from configure + (thanks to Justin Boffemmyer)(EJAB-592) + 2008-04-01 Badlop <badlop@process-one.net> * doc/guide.tex: Updated command line parameters, epmd section diff --git a/src/Makefile.in b/src/Makefile.in index b758b5f09..fa864b83a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -46,6 +46,7 @@ ifeq (@pam@, pam) endif prefix = @prefix@ +exec_prefix = @exec_prefix@ SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @mod_proxy65@ @eldap@ @pam@ @web@ stringprep @tls@ @odbc@ @ejabberd_zlib@ ERLSHLIBS = expat_erl.so @@ -57,15 +58,15 @@ BEAMS = $(SOURCES:.erl=.beam) DESTDIR = -EJABBERDDIR = $(DESTDIR)@prefix@/var/lib/ejabberd +EJABBERDDIR = $(DESTDIR)@localstatedir@/lib/ejabberd BEAMDIR = $(EJABBERDDIR)/ebin PRIVDIR = $(EJABBERDDIR)/priv SODIR = $(PRIVDIR)/lib PBINDIR = $(PRIVDIR)/bin MSGSDIR = $(PRIVDIR)/msgs -LOGDIR = $(DESTDIR)@prefix@/var/log/ejabberd -ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd -SBINDIR = $(DESTDIR)@prefix@/sbin +LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd +ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd +SBINDIR = $(DESTDIR)@sbindir@ ifeq ($(shell uname),Darwin) DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress |