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

SVN Revision: 1272

diff --git a/ChangeLog b/ChangeLog
index 5652fee77ef9579d84f388cb53977254da916711..80c785e9d661999f447d97ebffd45b84b1f82e61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 b758b5f09ad72d1d20b7aa3dfeeb2184c42f00e7..fa864b83a31bc15a39592e95c247e4146728a01f 100644 (file)
--- 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