Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2025-01-01 17:53:00 +01:00
Code Releases Activity

Do not ignore values passed from configure (EJAB-592)

Browse Source 
SVN Revision: 1272
This commit is contained in:
Christophe Romain 2008-04-02 14:24:18 +00:00
parent 37fc28ef49
commit f0ee4f999d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3,6 +3,9 @@
* src/mod_pubsub/mod_pubsub.erl: add condition inclusion of pep in * src/mod_pubsub/mod_pubsub.erl: add condition inclusion of pep in
disco identity (EJAB-564) 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> 2008-04-01 Badlop <badlop@process-one.net>
* doc/guide.tex: Updated command line parameters, epmd section * doc/guide.tex: Updated command line parameters, epmd section

9
src/Makefile.in
View File

@ -46,6 +46,7 @@ ifeq (@pam@, pam)
endif endif
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@
SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @mod_proxy65@ @eldap@ @pam@ @web@ stringprep @tls@ @odbc@ @ejabberd_zlib@ SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @mod_proxy65@ @eldap@ @pam@ @web@ stringprep @tls@ @odbc@ @ejabberd_zlib@
ERLSHLIBS = expat_erl.so ERLSHLIBS = expat_erl.so
@ -57,15 +58,15 @@ BEAMS = $(SOURCES:.erl=.beam)
DESTDIR = DESTDIR =
EJABBERDDIR = $(DESTDIR)@prefix@/var/lib/ejabberd EJABBERDDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
BEAMDIR = $(EJABBERDDIR)/ebin BEAMDIR = $(EJABBERDDIR)/ebin
PRIVDIR = $(EJABBERDDIR)/priv PRIVDIR = $(EJABBERDDIR)/priv
SODIR = $(PRIVDIR)/lib SODIR = $(PRIVDIR)/lib
PBINDIR = $(PRIVDIR)/bin PBINDIR = $(PRIVDIR)/bin
MSGSDIR = $(PRIVDIR)/msgs MSGSDIR = $(PRIVDIR)/msgs
LOGDIR = $(DESTDIR)@prefix@/var/log/ejabberd LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
SBINDIR = $(DESTDIR)@prefix@/sbin SBINDIR = $(DESTDIR)@sbindir@
ifeq ($(shell uname),Darwin) ifeq ($(shell uname),Darwin)
DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress