Merge EDSP 0.5 w/ multi-arch support for external solvers

[apt.git] / ftparchive / makefile

diff --git a/ftparchive/makefile b/ftparchive/makefile
index ca6d8f9fe30692f69d22d87df7ad8b6e19234bd5..d1ffe182a2c4ebe7c74fe2a0db00a46dac5b8ce0 100644 (file)
--- a/ftparchive/makefile
+++ b/ftparchive/makefile
@@ -6,15 +6,16 @@ SUBDIR=ftparchive
 include ../buildlib/defaults.mak
 
 # The apt-ftparchive program
-ifdef DB2LIB
+ifdef BDBLIB
+APT_DOMAIN:=apt-utils
 PROGRAM=apt-ftparchive
-SLIBS = -lapt-pkg -lapt-inst $(DB2LIB)
+SLIBS = -lapt-pkg -lapt-inst $(BDBLIB) $(INTLLIBS)
 LIB_MAKES = apt-pkg/makefile apt-inst/makefile
 SOURCE = apt-ftparchive.cc cachedb.cc writer.cc contents.cc override.cc \
-         multicompress.cc
+         multicompress.cc sources.cc
 include $(PROGRAM_H)
 else
 PROGRAM=apt-ftparchive
-MESSAGE="Must have db2 to build apt-ftparchive"
+MESSAGE="Must have libdb to build apt-ftparchive"
 include $(FAIL_H)
-endif # ifdef DB2LIB
+endif # ifdef BDBLIB