# HG changeset patch # User John Tsiombikas # Date 1334525105 -10800 # Node ID b266386d19ceeb6d72188e59404087b711d09deb # Parent 56a08d00bb4187812e27b4a817a2a825638d347b fixed the makefile consted the pointers to cmp_func_t diff -r 56a08d00bb41 -r b266386d19ce Makefile.in --- a/Makefile.in Wed Oct 12 05:25:34 2011 +0300 +++ b/Makefile.in Mon Apr 16 00:25:05 2012 +0300 @@ -9,8 +9,8 @@ CFLAGS = -pedantic -Wall $(dbg) $(opt) -fPIC ifeq ($(shell uname -s), Darwin) - lib_a = $(name).a - lib_so = $(name).dylib + lib_a = lib$(name).a + lib_so = lib$(name).dylib shared = -dynamiclib else lib_a = lib$(name).a @@ -40,19 +40,23 @@ .PHONY: install install: - mkdir -p $(PREFIX)/include $(PREFIX)/lib - cp src/rbtree.h $(PREFIX)/include/rbtree.h - cp $(lib_a) $(PREFIX)/lib/$(lib_a) - cp $(lib_so) $(PREFIX)/lib/$(lib_so) + mkdir -p $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib + cp src/rbtree.h $(DESTDIR)$(PREFIX)/include/rbtree.h + cp $(lib_a) $(DESTDIR)$(PREFIX)/lib/$(lib_a) + cp $(lib_so) $(DESTDIR)$(PREFIX)/lib/$(lib_so) [ -n "$(soname)" ] \ - && rm -f $(PREFIX)/lib/$(soname) $(PREFIX)/lib/$(devlink) \ - && ln -s $(PREFIX)/lib/$(lib_so) $(PREFIX)/lib/$(soname) \ - && ln -s $(PREFIX)/lib/$(soname) $(PREFIX)/lib/$(devlink) \ + && cd $(DESTDIR)$(PREFIX)/lib \ + && rm -f $(soname) $(devlink) \ + && ln -s $(lib_so) $(soname) \ + && ln -s $(soname) $(devlink) \ || true .PHONY: uninstall - rm -f $(PREFIX)/include/rbtree.h - rm -f $(PREFIX)/lib/$(lib_a) - rm -f $(PREFIX)/lib/$(lib_so) - rm -f $(PREFIX)/lib/$(soname) - rm -f $(PREFIX)/lib/$(devlink) +uninstall: + rm -f $(DESTDIR)$(PREFIX)/include/rbtree.h + rm -f $(DESTDIR)$(PREFIX)/lib/$(lib_a) + rm -f $(DESTDIR)$(PREFIX)/lib/$(lib_so) + [ -n "$(soname)" ] \ + && rm -f $(DESTDIR)$(PREFIX)/lib/$(soname) \ + && rm -f $(DESTDIR)$(PREFIX)/lib/$(devlink) \ + || true diff -r 56a08d00bb41 -r b266386d19ce src/rbtree.h --- a/src/rbtree.h Wed Oct 12 05:25:34 2011 +0300 +++ b/src/rbtree.h Mon Apr 16 00:25:05 2012 +0300 @@ -15,7 +15,7 @@ typedef void *(*rb_alloc_func_t)(size_t); typedef void (*rb_free_func_t)(void*); -typedef int (*rb_cmp_func_t)(void*, void*); +typedef int (*rb_cmp_func_t)(const void*, const void*); typedef void (*rb_del_func_t)(struct rbnode*, void*); #define RB_KEY_ADDR (rb_cmp_func_t)(0)