db1eb122c6
Conflicts: Makefile c_src/buildlib.sh include/bdberl.hrl int_test/DB_CONFIG rebar rebar.config test/bdberl_SUITE.erl
74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
--- db-5.2.36/dist/Makefile.in 2011-09-14 10:30:11.000000000 -0400
|
|
+++ db-5.2.36/dist/Makefile.in.patched 2011-11-28 12:15:04.000000000 -0500
|
|
@@ -239,7 +239,7 @@
|
|
|
|
LOG_VRFY_OBJS=\
|
|
log_verify@o@ log_verify_util@o@ log_verify_int@o@ \
|
|
- log_verify_auto@o@
|
|
+ log_verify_auto@o@
|
|
|
|
MUTEX_OBJS=\
|
|
mut_alloc@o@ mut_failchk@o@ mut_method@o@ mut_region@o@ mut_stat@o@
|
|
@@ -762,7 +762,7 @@
|
|
$(JAVA_EXDIR)/persist/gettingStarted/SimpleStorePut.java \
|
|
$(JAVA_EXDIR)/persist/txn/PayloadDataEntity.java \
|
|
$(JAVA_EXDIR)/persist/txn/StoreWriter.java \
|
|
- $(JAVA_EXDIR)/persist/txn/TxnGuideDPL.java
|
|
+ $(JAVA_EXDIR)/persist/txn/TxnGuideDPL.java
|
|
|
|
SQL_OBJS=\
|
|
sqlite3@o@ $(C_OBJS)
|
|
@@ -1067,9 +1067,9 @@
|
|
# Library and standard utilities install.
|
|
##################################################
|
|
library_install: install_setup
|
|
-library_install: install_include install_lib install_utilities install_docs
|
|
+library_install: install_include install_lib install_utilities
|
|
|
|
-uninstall: uninstall_include uninstall_lib uninstall_utilities uninstall_docs
|
|
+uninstall: uninstall_include uninstall_lib uninstall_utilities
|
|
|
|
install_setup:
|
|
@test -d $(DESTDIR)$(prefix) || \
|
|
@@ -1145,22 +1145,6 @@
|
|
$(RM) $$i; \
|
|
done)
|
|
|
|
-# We install csharp docs even on UNIX so we don't have a
|
|
-# broken link on the landing page.
|
|
-DOCLIST=api_reference articles bdb-sql collections csharp \
|
|
- gsg gsg_db_rep gsg_txn index.html installation java \
|
|
- license porting programmer_reference upgrading
|
|
-
|
|
-install_docs:
|
|
- @echo "Installing documentation: $(DESTDIR)$(docdir) ..."
|
|
- @test -d $(DESTDIR)$(docdir) || \
|
|
- ($(MKDIR) -p $(DESTDIR)$(docdir) && \
|
|
- $(CHMOD) $(dmode) $(DESTDIR)$(docdir))
|
|
- @cd $(DESTDIR)$(docdir) && $(RM) -r $(DOCLIST)
|
|
- @cd $(topdir)/docs && $(CP) -pr $(DOCLIST) $(DESTDIR)$(docdir)/
|
|
-
|
|
-uninstall_docs:
|
|
- @cd $(DESTDIR)$(docdir) && $(RM) -r $(DOCLIST)
|
|
|
|
##################################################
|
|
# Remaining standard Makefile targets.
|
|
@@ -1335,7 +1319,7 @@
|
|
db_repsite: $(DBREPSITE_OBJS) $(DEF_LIB_CXX)
|
|
$(CXXLINK) -o $@ \
|
|
$(LDFLAGS) $(DBREPSITE_OBJS) $(DEF_LIB_CXX) $(TEST_LIBS) $(LIBS)
|
|
- $(POSTLINK) $@
|
|
+ $(POSTLINK) $@
|
|
|
|
db_reptest@o@: $(testdir)/repmgr/db_reptest.c
|
|
$(CC) $(CFLAGS) $?
|
|
@@ -1349,7 +1333,7 @@
|
|
$(CC) $(CFLAGS) $?
|
|
DBREPTEST_OBJS=\
|
|
db_reptest@o@ reptest_am@o@ reptest_handles@o@ \
|
|
- reptest_spawn@o@ reptest_util@o@
|
|
+ reptest_spawn@o@ reptest_util@o@
|
|
|
|
db_reptest: $(DBREPTEST_OBJS) $(DEF_LIB)
|
|
$(CCLINK) -o $@ \
|