From: Yehuda Sadeh <yehuda@inktank.com>
Date: Wed, 15 Jan 2014 00:50:19 +0000 (-0800)
Subject: rgw: modify the civetweb rule
X-Git-Tag: v0.78~274^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=287ea5ca6e25a9b700808aec55376ccdae141a4a;p=ceph.git

rgw: modify the civetweb rule

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am
index 8e7b1337bce2..99a78b323a59 100644
--- a/src/rgw/Makefile.am
+++ b/src/rgw/Makefile.am
@@ -51,8 +51,6 @@ LIBRGW_DEPS += \
 	-lfcgi \
 	-ldl
 
-CIVETWEB = civetweb
-
 radosgw_SOURCES = \
 	rgw/rgw_resolve.cc \
 	rgw/rgw_rest.cc \
@@ -72,9 +70,9 @@ radosgw_SOURCES = \
 	rgw/rgw_swift_auth.cc \
 	rgw/rgw_loadgen.cc \
 	rgw/rgw_civetweb.cc \
-	$(CIVETWEB)/src/civetweb.c \
+	civetweb/src/civetweb.c \
 	rgw/rgw_main.cc
-radosgw_CFLAGS = -I$(CIVETWEB)/include
+radosgw_CFLAGS = -Icivetweb/include
 radosgw_LDADD = $(LIBRGW) $(LIBRGW_DEPS) $(RESOLV_LIBS) $(CEPH_GLOBAL)
 bin_PROGRAMS += radosgw