- wrong branch

Changed files:
    ejabberd-makefile.patch -> 1.6

diff --git a/ejabberd-makefile.patch b/ejabberd-makefile.patch
index caed33315f88d6da1dea06703bcb874340a41210..ca78ded891c3e8fab9903c7445cf4b761878e211 100644 (file)
--- a/ejabberd-makefile.patch
+++ b/ejabberd-makefile.patch
@@ -1,22 +1,19 @@
-diff -ur ejabberd/src/Makefile.in ejabberd.new/src/Makefile.in
---- ejabberd/src/Makefile.in   2008-07-22 20:46:21.436869256 +0200
-+++ ejabberd.new/src/Makefile.in       2008-07-22 20:54:06.653072763 +0200
-@@ -74,7 +74,7 @@
+--- ejabberd-2.0.0/src/Makefile.in.orig        2008-02-21 11:02:12.000000000 +0100
++++ ejabberd-2.0.0/src/Makefile.in     2008-02-22 14:52:47.000000000 +0100
+@@ -56,14 +56,14 @@
+ 
  DESTDIR =
  
- # /etc/ejabberd/
+-EJABBERDDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
++EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
+ BEAMDIR = $(EJABBERDDIR)/ebin
+ PRIVDIR = $(EJABBERDDIR)/priv
+ SODIR = $(PRIVDIR)/lib
+ PBINDIR = $(PRIVDIR)/bin
+ MSGSDIR = $(PRIVDIR)/msgs
+ LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
 -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
 +ETCDIR = $(DESTDIR)@sysconfdir@/jabber
- 
- # /sbin/
  SBINDIR = $(DESTDIR)@sbindir@
-@@ -85,7 +85,7 @@
- # /share/doc/ejabberd
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
- datarootdir = @datarootdir@
--DOCDIR = @docdir@
-+DOCDIR = $(DESTDIR)@docdir@
  
- # /usr/lib/ejabberd/ebin/
- BEAMDIR = $(EJABBERDDIR)/ebin
-Tylko w ejabberd.new/src: Makefile.in~
+ ifeq ($(shell uname),Darwin)