summaryrefslogtreecommitdiff
path: root/GNUmakefile
diff options
context:
space:
mode:
authorBryan Ischo <bryan@ischo.com>2008-09-04 12:40:17 +0000
committerBryan Ischo <bryan@ischo.com>2008-09-04 12:40:17 +0000
commiteddd387eec79e6fb3316f97f41ea7dd58898f588 (patch)
treeb6a6224adfd9446aa77c582c067f23ee143ef998 /GNUmakefile
parent67d461d704f27e65ee4349e99ec8f7006e3bca2d (diff)
downloadceph-libs3-eddd387eec79e6fb3316f97f41ea7dd58898f588.tar.gz
* Minor cleanups
* Fixed bug where list bucket common prefixes were not being properly parsed * Fix typo in s3 argument * Reset the curl handle after each request, this fixes problems with issuing multiple requests by re-use of curl handles
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile
index b8086c8..e74049e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -89,7 +89,8 @@ endif
CFLAGS += -Wall -Werror -std=c99 -Iinc \
$(CURL_CFLAGS) $(LIBXML2_CFLAGS) \
-DLIBS3_VER_MAJOR=\"$(LIBS3_VER_MAJOR)\" \
- -DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\"
+ -DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\" \
+ -DLIBS3_VER=\"$(LIBS3_VER)\"
LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) -lpthread
@@ -116,7 +117,7 @@ install: libs3 s3 headers
install -Dps -m u+rwx,go+rx $(BUILD)/bin/s3 $(DESTDIR)/bin/s3
install -Dp -m u+rw,go+r $(BUILD)/include/libs3.h \
$(DESTDIR)/include/libs3.h
- install -Dps -m u+rw,go+r $(BUILD)/lib/libs3.a $(DESTDIR)/lib/libs3.a
+ install -Dp -m u+rw,go+r $(BUILD)/lib/libs3.a $(DESTDIR)/lib/libs3.a
install -Dps -m u+rw,go+r $(BUILD)/lib/libs3.so.$(LIBS3_VER_MAJOR) \
$(DESTDIR)/lib/libs3.so.$(LIBS3_VER)
ln -sf libs3.so.$(LIBS3_VER) $(DESTDIR)/lib/libs3.so.$(LIBS3_VER_MAJOR)