Merge remote-tracking branch 'origin/mdb.master'

2026-01-04 06:01:23 -05:00 · 2012-11-30 12:47:00 -08:00 · 2012-11-30 12:47:00 -08:00 · 1509d75363
commit 1509d75363
parent e51aff55e6 98fe339089
18 changed files with 11 additions and 2 deletions
--- a/libraries/liblmdb/.gitignore
+++ b/libraries/liblmdb/.gitignore
--- a/libraries/liblmdb/COPYRIGHT
+++ b/libraries/liblmdb/COPYRIGHT
--- a/libraries/liblmdb/Doxyfile
+++ b/libraries/liblmdb/Doxyfile
--- a/libraries/liblmdb/LICENSE
+++ b/libraries/liblmdb/LICENSE
--- a/libraries/liblmdb/Makefile
+++ b/libraries/liblmdb/Makefile
@ -4,9 +4,18 @@ OPT = -O2 -g
 CFLAGS	= -pthread $(OPT) $(W) $(XCFLAGS)
 LDLIBS	=
 SOLIBS	=
+prefix	= /usr/local

-PROGS	= mdb_stat mdb_copy mtest mtest2 mtest3 mtest4 mtest5
-all:	liblmdb.a liblmdb.so $(PROGS)
+IHDRS	= lmdb.h
+ILIBS	= liblmdb.a liblmdb.so
+IPROGS	= mdb_stat mdb_copy
+PROGS	= $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
+all:	$(ILIBS) $(PROGS)
+
+install: $(ILIBS) $(IPROGS) $(IHDRS)
+	cp $(IPROGS) $(prefix)/bin
+	cp $(ILIBS) $(prefix)/lib
+	cp $(IHDRS) $(prefix)/include

 clean:
 	rm -rf $(PROGS) *.[ao] *.so *~ testdb
--- a/libraries/liblmdb/lmdb.h
+++ b/libraries/liblmdb/lmdb.h
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
--- a/libraries/liblmdb/mdb_copy.c
+++ b/libraries/liblmdb/mdb_copy.c
--- a/libraries/liblmdb/mdb_stat.c
+++ b/libraries/liblmdb/mdb_stat.c
--- a/libraries/liblmdb/mfree.c
+++ b/libraries/liblmdb/mfree.c
--- a/libraries/liblmdb/midl.c
+++ b/libraries/liblmdb/midl.c
--- a/libraries/liblmdb/midl.h
+++ b/libraries/liblmdb/midl.h
--- a/libraries/liblmdb/mtest.c
+++ b/libraries/liblmdb/mtest.c
--- a/libraries/liblmdb/mtest2.c
+++ b/libraries/liblmdb/mtest2.c
--- a/libraries/liblmdb/mtest3.c
+++ b/libraries/liblmdb/mtest3.c
--- a/libraries/liblmdb/mtest4.c
+++ b/libraries/liblmdb/mtest4.c
--- a/libraries/liblmdb/mtest5.c
+++ b/libraries/liblmdb/mtest5.c
--- a/libraries/liblmdb/mtest6.c
+++ b/libraries/liblmdb/mtest6.c