main/main.c: call new myoptfile()

include/Makefile.in, include/dpkg.h.in: add dpkgconfdir

diff --git a/ChangeLog b/ChangeLog
index 4344a13fc33d94519cc0d321f15d8940608ae7a5..f06817df503c4e002b9a3b9a06b6bb3b80953a38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@ Sun Oct  1 20:09:42 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
   * main/enquiry.c: fix the listpackage output logic
   * main/filesdb.c: fix error cleanup in ensure_statoverride
   * lib/myopt.c: add myoptfile() so we can read configuration files
+  * main/main.c: call new myoptfile()
+  * include/Makefile.in, include/dpkg.h.in: add dpkgconfdir
 
 Mon Sep 25 16:19:05 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 

diff --git a/Makefile.conf.in b/Makefile.conf.in
index b4d2e507900dfadcb8ca02d55c1d92fd9c457345..9dd2622f5db70154dccb69deaa079ba9344ae3ab 100644 (file)
--- a/Makefile.conf.in
+++ b/Makefile.conf.in
@@ -32,6 +32,7 @@ man5dir                       = $(mandir)/man5
 man8dir                        = $(mandir)/man8
 
 sysconfdir             = @sysconfdir@
+dpkgconfdir            = $(sysconfdir)/dpkg
 alternativesdir                = $(sysconfdir)/alternatives
 
 PERL                   = @PERL@

diff --git a/debian/changelog b/debian/changelog
index 996570e5c28a3f2d415e8809aaa69d489de0c83a..7e0c3893826743cd3c00e4c2e035886c88526208 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ dpkg (1.7.0) unstable; urgency=low
   * Clean up fd handling in some places. Closes: Bug#69359,#69360,#69361
   * Document -k option for dpkg-buildpackage. Closes: Bug#71808
   * Install dummy shlibs.default and shlibs.override files
+  * Give dpkg a configurationfile
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/include/Makefile.in b/include/Makefile.in
index 1bd92ef6361bafb06e6c13db5d656533430e0eb6..65a3273e2ac792b6af8c2824d6ea2cc6f0dafc3e 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -17,6 +17,8 @@ cvslean:: clean
        rm -f Makefile
 
 dpkg.h: dpkg.h.in
-       sed 's,#ADMINDIR#,$(admindir),; s,#LIBDIR#,$(dpkglibdir),;' $< > $@
+       sed -e 's,#CONFIGDIR#,$(dpkgconfdir),' \
+               -e 's,#ADMINDIR#,$(admindir),' \
+               -e 's,#LIBDIR#,$(dpkglibdir),; $< > $@
 
 .PHONY: all install clean distclean

diff --git a/include/dpkg.h.in b/include/dpkg.h.in
index 81ec4d15deb30c1f5c5a99e2781618ab4e152a66..8bbc5ca88da76fe2de3f966d4bb4c96f56d35ddc 100644 (file)
--- a/include/dpkg.h.in
+++ b/include/dpkg.h.in
@@ -67,6 +67,7 @@
 #define LISTFILE           "list"
 
 #define ADMINDIR          "#ADMINDIR#"
+#define CONFIGDIR         "#CONFIGDIR#"
 #define STATUSFILE        "status"
 #define AVAILFILE         "available"
 #define LOCKFILE          "lock"

diff --git a/main/main.c b/main/main.c
index c6ca357181544fdcb7f68d20cdb919abcb037dcf..70054a29c55a3deec658e02fc1295e07a524348c 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -415,6 +415,7 @@ int main(int argc, const char *const *argv) {
     }
   }
 
+  myfileopt(CONFIGDIR "/" DPKG, cmdinfos);
   myopt(&argv,cmdinfos);
   if (!cipaction) badusage(_("need an action option"));