diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-04-11 17:45:36 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-04-11 17:45:36 +0200 |
| commit | c3753d1de25737aed66d6ca14d0473042b7c55a7 (patch) | |
| tree | 750745b523fee36d66b4cdd041fc8117be22c5fe /ftparchive | |
| parent | 621aeca0bc8fe39c57d6221c7581c758e5822fd0 (diff) | |
| parent | d68d65ad637526e46ea77ab83e07470d26df15fc (diff) | |
merged from donkults experimental branch
Diffstat (limited to 'ftparchive')
| -rw-r--r-- | ftparchive/apt-ftparchive.cc | 2 | ||||
| -rw-r--r-- | ftparchive/makefile | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index f289eb00d..4efbecc8c 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -587,7 +587,7 @@ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup) /* */ bool ShowHelp(CommandLine &CmdL) { - ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return true; diff --git a/ftparchive/makefile b/ftparchive/makefile index 504ebf893..c53ecff72 100644 --- a/ftparchive/makefile +++ b/ftparchive/makefile @@ -7,6 +7,7 @@ include ../buildlib/defaults.mak # The apt-ftparchive program ifdef BDBLIB +APT_DOMAIN:=apt-utils PROGRAM=apt-ftparchive SLIBS = -lapt-pkg -lapt-inst $(BDBLIB) $(INTLLIBS) LIB_MAKES = apt-pkg/makefile apt-inst/makefile @@ -15,6 +16,6 @@ SOURCE = apt-ftparchive.cc cachedb.cc writer.cc contents.cc override.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 BDBLIB |