From: Wichert Akkerman <wakkerma@debian.org>
Date: Sun, 1 Oct 2000 19:37:38 +0000 (+0000)
Subject: and now it compiles again
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c90e548005432d5c208b84264f2af48ab0218c5;p=dpkg

and now it compiles again
---

diff --git a/ChangeLog b/ChangeLog
index f06817df..67b75b6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@ 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
+  * lib/myopt.[ch]: add myoptfile() so we can read configuration files
   * main/main.c: call new myoptfile()
   * include/Makefile.in, include/dpkg.h.in: add dpkgconfdir
 
diff --git a/include/Makefile.in b/include/Makefile.in
index 65a3273e..56278a73 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -19,6 +19,6 @@ cvslean:: clean
 dpkg.h: dpkg.h.in
 	sed -e 's,#CONFIGDIR#,$(dpkgconfdir),' \
 		-e 's,#ADMINDIR#,$(admindir),' \
-		-e 's,#LIBDIR#,$(dpkglibdir),; $< > $@
+		-e 's,#LIBDIR#,$(dpkglibdir),' $< > $@
 
 .PHONY: all install clean distclean
diff --git a/include/myopt.h b/include/myopt.h
index 0b28d09a..34ab4724 100644
--- a/include/myopt.h
+++ b/include/myopt.h
@@ -36,6 +36,7 @@ struct cmdinfo {
   voidfnp farg;
 };
 
+void myfileopt(const char* fn, const struct cmdinfo* cmdinfos);
 void myopt(const char *const **argvp, const struct cmdinfo *cmdinfos);
 
 #endif /* MYOPT_H */
diff --git a/lib/myopt.c b/lib/myopt.c
index d625436c..c8e0a3c2 100644
--- a/lib/myopt.c
+++ b/lib/myopt.c
@@ -26,7 +26,7 @@
 #include <myopt.h>
 #include <dpkg.h>
 
-void myoptfile(const char* fn, const struct cmdinfo* cmdinfos) {
+void myfileopt(const char* fn, const struct cmdinfo* cmdinfos) {
   FILE* file;
   char linebuf[MAXDIVERTFILENAME];