The map::at method does not always exist, so instead use map::find.

[cumulus.git] / Makefile

diff --git a/Makefile b/Makefile
index 911efcc..bf6561c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
 PACKAGES=sqlite3 uuid
-DEBUG=-g #-pg
+DEBUG=-g
 CXXFLAGS=-O -Wall -D_FILE_OFFSET_BITS=64 $(DEBUG) \
-        `pkg-config --cflags $(PACKAGES)` -DCUMULUS_VERSION=`cat version`
-LDFLAGS=$(DEBUG) `pkg-config --libs $(PACKAGES)`
+        $(shell pkg-config --cflags $(PACKAGES)) \
+        -DCUMULUS_VERSION=$(shell cat version)
+LDFLAGS=$(DEBUG) $(shell pkg-config --libs $(PACKAGES))
 
 SRCS=chunk.cc localdb.cc metadata.cc ref.cc remote.cc scandir.cc sha1.cc \
      store.cc subfile.cc util.cc
@@ -12,11 +13,11 @@ cumulus : $(OBJS)
        $(CXX) $(LDFLAGS) -o $@ $^
 
 version : NEWS
-       (git-describe || (head -n1 NEWS | cut -d" " -f1)) >version 2>/dev/null
+       (git describe || (head -n1 NEWS | cut -d" " -f1)) >version 2>/dev/null
 $(OBJS) : version
 
 clean :
-       rm -f $(OBJS) lbs version
+       rm -f $(OBJS) cumulus version
 
 dep :
        touch Makefile.dep