1.1 --- a/Makefile	Thu May 01 11:57:24 2008 +0100
     1.2 +++ b/Makefile	Thu May 01 12:00:23 2008 +0100
     1.3 @@ -1,10 +1,14 @@
     1.4 +RABBIT_SOURCE_ROOT=../rabbitmq
     1.5 +RABBIT_SERVER_SOURCE_ROOT=$(RABBIT_SOURCE_ROOT)/erlang/rabbit
     1.6 +RABBIT_SERVER_INCLUDE_DIR=$(RABBIT_SERVER_SOURCE_ROOT)/include
     1.7 +
     1.8  SOURCE_DIR=src
     1.9  EBIN_DIR=ebin
    1.10  INCLUDE_DIR=include
    1.11  INCLUDES=$(wildcard $(INCLUDE_DIR)/*.hrl)
    1.12  SOURCES=$(wildcard $(SOURCE_DIR)/*.erl)
    1.13  TARGETS=$(patsubst $(SOURCE_DIR)/%.erl, $(EBIN_DIR)/%.beam,$(SOURCES)) ebin/httpd.conf.tmp
    1.14 -ERLC_OPTS=-I $(INCLUDE_DIR) -o $(EBIN_DIR) -Wall +debug_info # +native -v
    1.15 +ERLC_OPTS=-I $(RABBIT_SERVER_INCLUDE_DIR) -I $(INCLUDE_DIR) -o $(EBIN_DIR) -Wall +debug_info # +native -v
    1.16  
    1.17  SERVER_ROOT=$(CURDIR)/server_root
    1.18  
    1.19 @@ -25,10 +29,9 @@
    1.20  
    1.21  run: all start_server
    1.22  
    1.23 -RABBIT_SOURCE_ROOT=../AMQ
    1.24  start_server:
    1.25  	mkdir -p $(SERVER_ROOT)/logs
    1.26 -	$(MAKE) -C $(RABBIT_SOURCE_ROOT)/erlang/rabbit run \
    1.27 +	$(MAKE) -C $(RABBIT_SERVER_SOURCE_ROOT) run \
    1.28  		RABBIT_ARGS='-pa '"$$(pwd)/$(EBIN_DIR)"' -rabbit \
    1.29  			rabbit_http_conf \"'"$$(pwd)"'/ebin/httpd.conf.tmp\" \
    1.30  			extra_startup_steps [{\"HTTP-JSON-listeners\",rabbit_http,kickstart,[]}]'

     2.1 --- a/src/rabbit_http_channel.erl	Thu May 01 11:57:24 2008 +0100
     2.2 +++ b/src/rabbit_http_channel.erl	Thu May 01 12:00:23 2008 +0100
     2.3 @@ -25,8 +25,8 @@
     2.4  -module(rabbit_http_channel).
     2.5  -behaviour(gen_server).
     2.6  
     2.7 --include_lib("rabbitmq_server/include/rabbit.hrl").
     2.8 --include_lib("rabbitmq_server/include/rabbit_framing.hrl").
     2.9 +-include("rabbit.hrl").
    2.10 +-include("rabbit_framing.hrl").
    2.11  
    2.12  -export([open/2, start_link/3]).
    2.13  -export([init/1, terminate/2, code_change/3, handle_call/3, handle_cast/2, handle_info/2]).