summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog8
-rw-r--r--src/Makefile.in2
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d2a46e95..2046af3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-27 Alexey Shchepin <alexey@sevcom.net>
+
+ * src/Makefile.in: Updated (thanks to Badlop)
+
2004-09-26 Alexey Shchepin <alexey@sevcom.net>
* src/aclocal.m4: Better expat and openssl detection (thanks to
@@ -11,8 +15,8 @@
* src/jlib.hrl: Added namespace for iq-register stream feature
* src/ejabberd_c2s.erl: Send iq-register feature
- * src/ejabberd_config.erl: Config file can be configured from the
- command line (thanks to Mickael Remond)
+ * src/ejabberd_config.erl: Config file can be configured via
+ environment variable (thanks to Mickael Remond)
* src/web/ejabberd_http.erl: Added SSL support (thanks to Sergei
Golovan)
diff --git a/src/Makefile.in b/src/Makefile.in
index 23192702..3b7de3b6 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -30,7 +30,7 @@ ETCDIR = $(DESTDIR)/etc/ejabberd
all: $(ERLSHLIBS) compile-beam all-recursive
compile-beam:
- @erl -s make all report -noinput -s erlang halt
+ @ERL@ -s make all report -noinput -s erlang halt
all-recursive install-recursive uninstall-recursive \