autogen.sh: copy gettextm4, lcmessage.m4 and progtest.m4 to automake/ systems without...

Makefile.in: remove the gettext-macros in distclean
utils/Makefile.in: fix clean target, link md5sum and start-stop-daemon optlib
optlib/*: getopt implementation for systems without GNU getopt.

diff --git a/ChangeLog b/ChangeLog
index 65e3b22008b305702d5427f9fd07a88c42c143a9..328854868b3643bf5fe7047bcc8bee6e66885b71 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Dec 15 16:08:47 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * autogen.sh: copy gettextm4, lcmessage.m4 and progtest.m4 to automake/
+    for systems without gettext installed
+  * Makefile.in: remove the gettext-macros in distclean
+  * utils/Makefile.in: fix clean target, link md5sum and start-stop-daemon
+    with optlib
+  * optlib/*: getopt implementation for systems without GNU getopt.
+
 Wed Dec 15 00:18:30 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * configure.in: Add option to disable building dselect

diff --git a/Makefile.in b/Makefile.in
index d496a2a13280a7b53f14bf83ee31d1ce07ee61fe..446c852fa140f76560c10f77a33b21737f10f1a5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
-
 VPATH          = @srcdir@
 srcdir         = @srcdir@
+top_srcdir     = @top_srcdir@
 
 VERSION                = $(shell cat verion-nr)
 
@@ -8,8 +8,8 @@ GENFILES        = version.h
 
 include Makefile.conf
 
-SUBDIRS                = include lib dpkg-deb split scripts utils main \
-                 utils doc @DSELECTDIR@ po methods
+SUBDIRS                = include lib optlib dpkg-deb split scripts utils main \
+                 utils @DSELECTDIR@ po methods doc
 
 all: version.h all-recursive
 
@@ -20,6 +20,7 @@ clean: clean-recursive
 
 distclean: clean distclean-recursive
        rm -f Makefile.conf Makefile config.cache config.h config.log config.status
+       rm -f automake/gettext.m4 automake/progtest.m4 automake/lcmessage.m4
 
 version.h: version-nr
        echo "#define DPKG_VERSION \"$(VERSION)\" /* This line modified by Makefile */" > version.h

diff --git a/configure.in b/configure.in
index b1e1511553bc4ae7ce413b70b197327fc4db160b..ab00fcdf8cfaf10d56a486b16ee88fc3c82703ba 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,6 +4,7 @@ AC_PREREQ([2.12])
 
 AC_INIT(include/dpkg.h.in)
 AC_CONFIG_HEADER(config.h)
+
 DSELECTDIR="dselect"
 AC_ARG_WITH(dselect,
 [  --with-dselect          the dselect package-management frontend],
@@ -135,6 +136,7 @@ include/Makefile
 dpkg-deb/Makefile
 split/Makefile
 lib/Makefile
+optlib/Makefile
 doc/Makefile
 doc/ja/Makefile
 scripts/Makefile

diff --git a/utils/Makefile.in b/utils/Makefile.in
index 362c0190ec0c287856508e9b9bf4b8e5affa1cbe..99a7342f01f6d6f9d997e1efbed4b751c8c18799 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -13,7 +13,8 @@ MD5_SOURCES           = md5sum.c md5.c
 MD5_OBJECTS            = $(patsubst %.c, %.o, $(MD5_SOURCES))
 MD5_MANPAGES           = md5sum.1
 
-GENFILES               = $(SSD_OBJECTS) start-stop-daemon
+GENFILES               = $(SSD_OBJECTS) start-stop-daemon \
+                         $(MD5_OBJECTS) md5sum
 
 .PHONY: all
 all:: start-stop-daemon md5sum
@@ -46,7 +47,7 @@ install-doc:
        $(mkinstalldirs) $(DESTDIR)/$(man1dir)
        $(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir)
 
-start-stop-daemon: $(SSD_OBJECTS)
+start-stop-daemon: $(SSD_OBJECTS) ../optlib/libopt.a
 
-md5sum: $(MD5_OBJECTS)
+md5sum: $(MD5_OBJECTS) ../optlib/libopt.a