Move the new buildsystem into the main branch

.cvsignore

@@ -1,5 +1,6 @@
 ABOUT-NLS
-Makefile.in
+Makefile
+Makefile.conf
 aclocal.m4
 config.guess
 config.h.in

Makefile.am

@@ -1,76 +0,0 @@
-## Process this file with automake to produce a Makefile.in
-
-AUTOMAKE_OPTIONS	= 1.1 foreign
-
-if HAVE_CPLUSPLUS
-CPPSUBDIRS		= dselect methods
-else
-CPPSUBDIRS		=
-endif
-
-SUBDIRS			= po intl include lib main dpkg-deb split \
-			  md5sum scripts utils $(CPPSUBDIRS) doc
-
-## Directory definitions
-
-pkglocalstatedir	= $(sharedstatedir)/@PACKAGE@
-pkglibdir		= $(libdir)/@PACKAGE@
-
-docdir			= $(prefix)/doc
-pkgdocdir		= $(docdir)/@PACKAGE@
-
-## Various options
-
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
-OPTCFLAGS		= @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
-LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
-LIBS			= @LIBS@ $(XLIBS)
-
-export CFLAGS OPTCFLAGS LDFLAGS LIBS
-
-## Automake variables
-
-# Can set this to "build" (wrapper found in debmake)
-DEBIAN_BUILD		= dpkg-buildpackage
-
-# May want to add -a<arch>?
-DEBIAN_FLAGS		=
-
-BUILT_SOURCES		= version.h config.h
-EXTRA_DIST		= archtable COPYING INSTALL 
-
-CLEANFILES		= version.h.new
-DISTCLEANFILES		= version.h config.h
-MAINTAINERCLEANFILES	= libtool
-
-DISTDEBFILES		= 50dpkg-dev.el changelog control copyright \
-			  dev-README postinst preinst prerm rules \
-			  shlibs shlibs.default.template shlibs.local
-
-MAINTCLEANFILES		= Makefile.in aclocal.m4 config.guess \
-			  config.h.in config.sub configure install-sh \
-			  ltconfig ltmain.sh mkinstalldirs ABOUT-NLS \
-			  po/Makefile.in.in po/stamp-cat-id po/cat-id-tbl.c \
-			  po/dpkg.pot stamp-h.in missing
-## Rules
-
-.PHONY: install-data-local uninstall-local dist-hook maintainer-clean-local
-
-uninstall-local:
-	-for d in $(pkglocalstatedir) $(pkglibdir) $(pkgdocdir); do \
-		[ -e $$d ] && rmdir $$d; \
-	done
-
-dist-hook:
-	$(mkinstalldirs) $(distdir)/debian
-	set -e; for i in $(DISTDEBFILES); do \
-		cp -p $(srcdir)/debian/$$i $(distdir)/debian/; \
-	done
-	$(mkinstalldirs) $(distdir)/automake
-	cp -dp $(top_srcdir)/automake/[a-z]* $(distdir)/automake/
-
-maintainer-clean-local:
-	-cd $(srcdir) && rm -f $(MAINTCLEANFILES)
-	-$(RM) -r $(srcdir)/intl
-
-## End of file.

Makefile.conf.in

@@ -0,0 +1,71 @@
+
+# What are we building anyway?
+PACKAGE			= @PACKAGE@
+VERSION			= @VERSION@
+
+# Directory settings
+prefix			= @prefix@
+exec_prefix		= $(prefix)
+sharedir		= $(prefix)/share
+
+docdir			= $(sharedir)/doc/$(PACKAGE)
+copyingfile		= $(docdir)/copyright
+infodir			= @infodir@
+
+datadir			= @datadir@
+localedir		= $(datadir)/locale
+bindir			= @bindir@
+sbindir			= @sbindir@
+
+libdir			= $(prefix)/lib
+dpkglibdir		= $(libdir)/$(PACKAGE)
+
+methodsdir		= $(dpkglibdir)/methods
+parsechangelogdir	= $(dpkglibdir)/parsechangelog
+elispdir		= @lispdir@
+
+admindir		= /var/lib/$(PACKAGE)
+
+mandir			= @mandir@
+man1dir			= $(mandir)/man1
+man5dir			= $(mandir)/man5
+man8dir			= $(mandir)/man8
+
+sysconfdir		= @sysconfdir@
+alternativesdir		= $(sysconfdir)/alternatives
+
+perlpath		= @perlpath@
+mkinstalldirs		= $(SHELL) $(top_srcdir)/mkinstalldirs
+LN			= @LN_S@
+
+CC			= @CC@
+CFLAGS			= @CFLAGS@
+INSTALL			= @INSTALL@
+INSTALL_PROGRAM		= @INSTALL_PROGRAM@
+INSTALL_DATA		= @INSTALL_DATA@
+INSTALL_SCRIPT		= @INSTALL_SCRIPT@
+SED			= @SED@
+RM			= @RM@
+
+CXX			= @CXX@
+CXXFLAGS		= @CXXFLAGS@
+
+LD			= @LD@
+LDFLAGS			= @LDFLAGS@
+LIBS			= @LIBS@
+
+DEFS			= @DEFS@
+INCLUDE_CFLAGS		= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) -I../include -I.. -I.
+
+NLS_CFLAGS		= -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl -I../intl
+NLS_LIBS		= @INTLLIBS@ 
+
+ALL_CFLAGS		= $(CFLAGS) $(DEFS) $(NLS_CFLAGS) $(INCLUDE_CFLAGS)
+ALL_CXXFLAGS		= $(ALL_CFLAGS) $(CXXFLAGS)
+
+.c.o:
+	$(CC) $(ALL_CFLAGS) -c $<
+
+.cc.o:
+	$(CXX) $(ALL_CXXFLAGS) -c $<
+

Makefile.in

@@ -0,0 +1,34 @@
+
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+VERSION		= $(shell cat verion-nr)
+
+GENFILES	= version.h
+
+include Makefile.conf
+
+SUBDIRS		= include lib dpkg-deb split scripts utils main \
+		  utils doc dselect po methods
+
+all: version.h all-recursive
+
+install: all install-recursive
+
+clean: clean-recursive
+	rm -f $(GENFILES)
+
+cvsclean: clean cvsclean-recursive
+	rm -f Makefile.conf Makefile config.cache config.h config.log config.status
+
+version.h: version-nr
+	echo "#define DPKG_VERSION \"$(VERSION)\" /* This line modified by Makefile */" > version.h
+
+all-recursive install-recursive clean-recursive cvsclean-recursive:
+	set -e ; target=`echo $@ | sed s/-recursive//`; \
+	    for d in $(SUBDIRS) ; do \
+	    $(MAKE) $(MFLAGS) -C $$d $$target ; \
+	done;
+
+.PHONY: all install clean cvsclean 
+.PHONY: all-recursve install-recursive clean-recursive cvsclean-recursive

debian/.cvsignore

@@ -1,3 +1,6 @@
-tmp-main
-tmp-dev
+tmp-dpkg
+tmp-dpkg-dev
+tmp-dpkg-doc
+files
 substvars
+dpkg.substvars

debian/dev-README

@@ -1,2 +0,0 @@
-All dpkg documentation in /usr/share/doc, including the developers'
-information which comes in the dpkg-dev package, is in /usr/share/doc/dpkg.

debian/dpkg-dev.conffiles

@@ -0,0 +1 @@
+/etc/emacs/site-start.d/50dpkg-dev.el

debian/dpkg-doc.doc-base

@@ -0,0 +1,11 @@
+Document: dpkg-internals
+Title: dpkg Internals Guide
+Author: Klee Dienes <klee@mit.edu>
+Abstract: This manual describes the internal structure of the
+ dpkg package management system.
+Section: Apps/System
+
+Format: HTML
+Index: /usr/share/doc/dpkg-doc/internals.html/index.html
+Files: /usr/share/doc/dpkg-doc/internals.html/*.html
+

debian/dpkg-doc-postinst

@@ -6,13 +6,8 @@ if [ "$1" = configure ]; then
     fi
     if command -v install-docs >/dev/null 2>&1; then
 	echo -n "Registering DPKG documentation..."
-	install-docs -i /usr/share/doc-base/dpkg-internals
+	install-docs -i /usr/share/doc-base/dpkg-doc
 	echo "done."
     fi
 fi
 
-install-info \
-	--quiet \
-	--description="dpkg Internals Guide." \
-	--section "Miscellaneous" "Miscellaneous" \
-	/usr/share/info/internals.info.gz

debian/dpkg-doc-prerm

@@ -12,13 +12,9 @@ case "$1" in
     remove|deconfigure|upgrade)
 	if command -v install-docs >/dev/null 2>&1; then
 	    echo -n "Unregistering DPKG documentation..."
-	    install-docs -r dpkg-internals || true
+	    install-docs -r dpkg-doc || true
 	    echo "done."
 	fi
 	;;
 esac
 
-install-info \
-	--quiet \
-	--remove \
-	/usr/share/info/internals.info.gz

debian/dpkg.preinst

@@ -0,0 +1,86 @@
+#!/bin/sh -
+
+if [ "$1" != "upgrade" ]; then exit 0; fi
+
+set -e
+# i386elf: [ "$2" = "1.4.0.6" ] || dpkg --assert-support-predepends
+
+oldver="$2"
+
+case "$oldver" in
+	0.93.[01234]* | - )	;;
+	* )			exit 0 ;;
+esac
+
+echo '
+contemplating upgrade of dpkg from pre-0.93.50 version ...'
+
+trap 'es=$?; rm -f /var/lib/dpkg/bp.$$; exit $es' 0
+
+perl -000 -ne 'print $x if m/^Package:\s+(\S+\n)/im &&
+			  ($x=$1) ne "dpkg\n" &&
+			  m/^Status:.*(unpacked|postinst)/im' \
+	/var/lib/dpkg/status >/var/lib/dpkg/bp.$$
+
+if test -s /var/lib/dpkg/bp.$$
+then
+	echo '
+
+WARNING - have you read the release notes for this upgrade ?
+
+The following packages have been unpacked but not yet configured:'
+	echo '' `cat /var/lib/dpkg/bp.$$`
+	echo -n '
+If you proceed with the dpkg upgrade with these packages in this state
+you will LOSE ANY CONFIGURATION CHANGES that have been made to their
+configuration files.  I recommend that you back out of the upgrade
+now (see below) and then configure each of these packages using:
+ dpkg --configure --force-hold <package>
+
+If you do this and it fails for some packages they are broken anyway, in
+which case you probably don'"'"'t have that much to lose by going ahead
+with the upgrade.
+
+Type "yes" to confirm that you really want to do the upgrade in
+spite of my warning above; if you give any other response we'"'"'ll back
+off the upgrade to give you a chance to fix things.
+
+Continue with upgrade despite probable loss of config data ? '
+	read response
+	case "$response" in
+	[Yy][Ye][Ss] )	echo OK ... ;;
+	* )		echo 'Aborting dpkg upgrade.'; exit 1 ;;
+	esac
+fi
+
+echo -n '
+IMPORTANT - you must install this upgrade on its own, not together in
+the same dpkg run as any other packages.  Otherwise you risk losing
+configuration information.
+
+If you say "no" to the question below we'"'"'ll back off the upgrade now,
+and you can then do it later using:
+ dpkg --install dpkg-0.93.51.deb
+If you'"'"'re not sure what to do, say "no", and then run that command
+(with the appropriate dpkg-*.deb filename) from a root shell prompt.
+
+Are you installing only the dpkg upgrade in this dpkg run ? [y/n] '
+read response
+case "$response" in
+[yY]* | '' )
+	echo 'OK, going ahead.'
+	;;
+* )
+	echo '
+Aborting dpkg upgrade (you will see error messages from dpkg about this).'
+	exit 1
+	;;
+esac
+
+if [ -d /usr/lib/dpkg/methods/hd ]
+then
+	echo 'Removing obsolete /usr/lib/dpkg/methods/hd ...'
+	rm -r /usr/lib/dpkg/methods/hd
+fi
+
+exit 0

debian/dpkg.substvars

@@ -0,0 +1 @@
+shlibs:Pre-Depends=libc6 (>= 2.1), libncurses4 (>= 4.2-3.1)

debian/dselect-postinst

@@ -1,7 +0,0 @@
-#! /bin/sh
-
-if [ "$1" = configure ]; then
-    if [ -d /usr/doc -a ! -e /usr/doc/dselect -a -d /usr/share/doc/dselect ] ; then
-        ln -s ../share/doc/dselect /usr/doc/dselect
-    fi
-fi

debian/dselect-prerm

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = remove -o "$1" = "upgrade" ]; then
-    if [ -L /usr/doc/dselect ]; then
-        rm -f /usr/doc/dselect
-    fi
-fi
-

debian/rules

@@ -1,167 +1,230 @@
 #!/usr/bin/make -f
+# vim: nowrap ts=8
 
-SHELL=bash
+# Set shell to bash to we can use bashisms without having to worry
+SHELL		= bash
 
-.PHONY: clean build binary binary-trees binary-arch binary-indep
-
-BUILD := $(shell pwd)/build
-DIR := $(shell pwd)
-
-arch=$(shell dpkg --print-architecture)
-mcidir=debian/tmp-main/DEBIAN
+# Build locations
+BUILD		:= $(shell pwd)/build
+TMP		:= $(shell pwd)/debian/tmp
+TMP_DPKG	:= $(TMP)-dpkg
+TMP_DPKG_DEV	:= $(TMP)-dpkg-dev
+TMP_DPKG_DOC	:= $(TMP)-dpkg-doc
+DIR		:= $(shell pwd)
 
+# We should really get this in a different way...
+arch		= $(shell dpkg --print-architecture)
 
+# Setup the buildlocation
 $(BUILD)/config.status:
 	$(checkdir)
-	$(RM) -r $(BUILD)
 	install -d $(BUILD)
 	cd $(BUILD) && $(DIR)/configure \
-		--enable-shared \
 		--prefix=/usr \
 		--datadir=/usr/share \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--sysconfdir=/etc \
 		--sharedstatedir=/var/lib \
-		--localstatedir=/var/lib && \
-	    sed < libtool > libtool-2 \
-	    -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__NO_RPATH_PLEASE "/' \
-	    -e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' && \
-	    mv -f libtool-2 libtool && \
-	    chmod 755 libtool
+		--localstatedir=/var/lib
 
 clean:
 	$(checkdir)
-	$(RM) -r debian/{files,substvars,tmp*}
-	$(RM) -r $(BUILD)
-	find . \( -name '*~' -o -name '#*#' \) -print0 | xargs -r0 $(RM) --
+	rm -f debian/{files,substvars}
+	rm -f debian/dpkg,substvars
+	rm -fr $(BUILD) $(TMP) $(TMP_DPKG) $(TMP_DPKG_DEV) $(TMP_DPKG_DOC)
+	rm -f stamp-build stamp-binary
 
-build: $(BUILD)/config.status
-	$(checkdir)
-	$(MAKE) -C $(BUILD)
+build: stamp-build
+
+stamp-build: $(BUILD)/config.status
+	$(MAKE) $(MFLAGS) -C $(BUILD)
+	touch stamp-build
 
 binary: binary-arch binary-indep
 
-binary-trees: build
+stamp-binary: stamp-build
 	$(checkdir)
-	-$(RM) -r debian/tmp-{main,dev}
-	install -d debian/tmp-{main,dev}/{DEBIAN,etc,usr/share/doc/dpkg}
-	install -d debian/tmp-dev/usr/{lib/dpkg,share/doc/dpkg,sbin,bin}
-	ln -s dpkg debian/tmp-dev/usr/share/doc/dpkg-dev
-	install -d debian/tmp-dev/usr/share/man/{ja/man1,man1,ja/man8,man8}
-	install -d debian/tmp-dev/usr/share/emacs/site-lisp/dpkg-dev
-	install -d debian/tmp-main/sbin
-	set -e; if [ $(arch) = i386 ]; then \
-		sed -e 's/^# i386elf: //' <debian/preinst >$(mcidir)/preinst ; \
-	else \
-		sed -e '/^# i386elf: /d' debian/preinst >$(mcidir)/preinst ; \
-	fi
-	set -e; if [ -f debian/shlibs.default.$(arch) ]; then \
-		echo /etc/dpkg/shlibs.default >> debian/tmp-dev/DEBIAN/conffiles ; \
-		install -d debian/tmp-main/etc/dpkg; \
-		install -m644 debian/shlibs.default.$(arch) \
-		debian/tmp-dev/etc/dpkg/shlibs.default ; \
-	fi
-	cp debian/{prerm,postinst} $(mcidir)/.
-	
-	$(MAKE) -C $(BUILD) install \
-		prefix=$(DIR)/debian/tmp-main/usr \
-		sysconfdir=$(DIR)/debian/tmp-main/etc \
-		sharedstatedir=$(DIR)/debian/tmp-main/var/lib \
-		localstatedir=$(DIR)/debian/tmp-main/var/lib \
-		datadir=$(DIR)/debian/tmp-main/usr/share \
-		mandir=$(DIR)/debian/tmp-main/usr/share/man \
-		infodir=$(DIR)/debian/tmp-main/usr/share/info
-	
-	install -m 755 debian/dev-postinst debian/tmp-dev/DEBIAN/postinst
-	install -m 755 debian/dev-prerm debian/tmp-dev/DEBIAN/prerm
-	install -d debian/tmp-dev/etc/emacs/site-start.d
-	install -m 644 debian/50dpkg-dev.el debian/tmp-dev/etc/emacs/site-start.d/.
-	echo '/etc/emacs/site-start.d/50dpkg-dev.el' >> debian/tmp-dev/DEBIAN/conffiles
-	install -d debian/tmp-dev/usr/lib/emacsen-common/packages/{install,remove}
-	install -m 755 debian/emacsen-common-remove \
-	debian/tmp-dev/usr/lib/emacsen-common/packages/remove/dpkg-dev
-	install -m 755 debian/emacsen-common-install \
-	debian/tmp-dev/usr/lib/emacsen-common/packages/install/dpkg-dev
-	cp scripts/debian-changelog-mode.el \
-	debian/tmp-dev/usr/share/emacs/site-lisp/dpkg-dev
-	rm -f debian/tmp-main/usr/share/{x,}emacs/site-lisp/debian-changelog-mode.el*
-	chmod +x $(mcidir)/{postinst,prerm,preinst}
-	find debian/tmp-main/usr/share/man -type f | xargs gzip -9vf
-	set -e; for f in dpkg-buildpackage dpkg-gencontrol dpkg-distaddfile \
-		  dpkg-parsechangelog dpkg-genchanges dpkg-shlibdeps; do \
-		rm debian/tmp-main/usr/share/man/man1/$$f.1; \
-		ln -s dpkg-source.1.gz debian/tmp-main/usr/share/man/man1/$$f.1.gz ; \
+	test "`id -u`" -eq 0
+	rm -rf $(TMP)
+	$(MAKE) $(MFLAGS) -C $(BUILD) \
+		admindir=$(TMP)/var/lib/dpkg \
+		prefix=$(TMP)/usr \
+		datadir=$(TMP)/usr/share \
+		mandir=$(TMP)/usr/share/man \
+		infodir=$(TMP)/usr/share/info \
+		sysconfdir=$(TMP)/etc \
+		sharedstatedir=$(TMP)/var/lib \
+		localstatedir=$(TMP)/var/lib \
+		install
+	find $(TMP) -type d | xargs chmod 755
+	touch stamp-binary
+
+binary-dpkg: stamp-binary
+	rm -rf $(TMP_DPKG)
+	install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/doc/dpkg
+	install -d -m 755 -o root -g root $(TMP_DPKG)/usr/lib/dpkg
+	install -d -m 755 -o root -g root $(TMP_DPKG)/usr/bin
+	install -d -m 755 -o root -g root $(TMP_DPKG)/sbin
+	mv $(TMP)/etc $(TMP_DPKG)/
+	mv $(TMP)/var $(TMP_DPKG)/
+	mv $(TMP)/usr/sbin/start-stop-daemon $(TMP_DPKG)/sbin/
+	mv $(TMP)/usr/sbin $(TMP_DPKG)/usr/
+	mv $(TMP)/usr/lib/dpkg/mksplit $(TMP_DPKG)/usr/lib/dpkg/
+	mv $(TMP)/usr/lib/dpkg/methods $(TMP_DPKG)/usr/lib/dpkg/
+	mv $(TMP)/usr/share/locale $(TMP_DPKG)/usr/share/
+	set -e ; for i in dpkg dpkg-deb dpkg-split md5sum dselect ; do \
+		mv $(TMP)/usr/bin/$$i $(TMP_DPKG)/usr/bin/ ; \
 	done
-	ln -s ../man7/undocumented.7.gz debian/tmp-main/usr/share/man/man1/dpkg-divert.1.gz
-	gzip -9vf debian/tmp-main/usr/share/doc/dpkg/changelog*
-	cp debian/copyright debian/tmp-main/usr/share/doc/dpkg/copyright
-	chmod -x debian/tmp-main/usr/lib/libdpkg.*
-	set -e; for f in \
- usr/share/doc/dpkg/changelog.manuals.gz \
- usr/bin/dpkg-{source,genchanges,gencontrol,shlibdeps,buildpackage,parsechangelog} \
- usr/bin/{dpkg-distaddfile,822-date,dpkg-scanpackages,dpkg-scansources,dpkg-name,dpkg-architecture} \
- usr/share/man/{ja,.}/man1/dpkg-{source,genchanges,gencontrol,shlibdeps,buildpackage,architecture}.1.gz \
- usr/share/man/{ja,.}/man1/{dpkg-parsechangelog,dpkg-distaddfile,822-date,dpkg-name}.1.gz \
- usr/share/man/{ja,.}/man5 usr/share/man/{ja,.}/man8/dpkg-{scanpackages,scansources}.8.gz \
- usr/lib/dpkg/parsechangelog usr/lib/dpkg/controllib.pl \
-		; do if [ -e debian/tmp-main/$$f -o -L debian/tmp-main/$$f ] ; \
-			then mv -v debian/tmp-main/$$f debian/tmp-dev/$$f; \
-		fi done
-
-binary-indep: binary-trees
-	$(checkdir)
-	dpkg-gencontrol -pdpkg-dev -Pdebian/tmp-dev
-	install -d -m755 $(DIR)/debian/tmp-doc/DEBIAN
-	install -m755 $(DIR)/debian/dpkg-doc-postinst \
-		$(DIR)/debian/tmp-doc/DEBIAN/postinst
-	install -m755 $(DIR)/debian/dpkg-doc-prerm \
-		$(DIR)/debian/tmp-doc/DEBIAN/prerm
-	dpkg-gencontrol -pdpkg-doc -Pdebian/tmp-doc
-	chown -R root.root debian/tmp-dev
-	chmod -R g-ws,a+r,u+w debian/tmp-dev
-	dpkg-deb --build debian/tmp-dev ..
-	install -d -m755 $(DIR)/debian/tmp-doc/usr/share/{doc/dpkg,doc-base}
-	ln -s dpkg $(DIR)/debian/tmp-doc/usr/share/doc/dpkg-doc
-	$(MAKE) -C $(BUILD)/doc internals
-	$(MAKE) -C $(BUILD)/doc internals-install \
-		prefix=$(DIR)/debian/tmp-doc/usr \
-		sysconfdir=$(DIR)/debian/tmp-doc/etc \
-		sharedstatedir=$(DIR)/debian/tmp-doc/var/lib \
-		localstatedir=$(DIR)/debian/tmp-doc/var/lib \
-		datadir=$(DIR)/debian/tmp-doc/usr/share \
-		mandir=$(DIR)/debian/tmp-doc/usr/share/man \
-		infodir=$(DIR)/debian/tmp-doc/usr/share/info
-	gzip -9vf $(DIR)/debian/tmp-doc/usr/share/info/*
-	gzip -9vf $(DIR)/debian/tmp-doc/usr/share/doc/dpkg-doc/internals.ps
-	install -m644 $(DIR)/debian/dpkg-internals $(DIR)/debian/tmp-doc/usr/share/doc-base
-	dpkg-deb --build debian/tmp-doc ..
-	set -e;\
-		version=`sed -n 's/^Version: //p' $(DIR)/debian/tmp-dev/DEBIAN/control`; \
-		file=dpkg-$${version}.tar.gz; \
-		if [ -f $(DIR)/../dpkg_$${version}.tar.gz ]; then \
-			cp $(DIR)/../dpkg_$${version}.tar.gz $(DIR)/../$${file}; \
-			dpkg-distaddfile -f$(DIR)/debian/files $${file} byhand -; \
-		fi
-
-binary-arch: binary-trees
-	$(checkdir)
-	mv debian/tmp-main/usr/sbin/start-stop-daemon debian/tmp-main/sbin/start-stop-daemon
-	-strip debian/tmp-main/usr/{bin,sbin}/*	debian/tmp-main/sbin/*
-	-strip --strip-unneeded debian/tmp-main/usr/lib/libdpkg.so.*
-	-strip --strip-debug debian/tmp-main/usr/lib/libdpkg.a
-	dpkg-shlibdeps -dPre-Depends debian/tmp-main/usr/{bin,sbin}/*
-	dpkg-gencontrol -pdpkg -Pdebian/tmp-main
-	chown -R root.root debian/tmp-main
-	chmod -R g-ws,a+r,u+w debian/tmp-main
-	set -e; \
-		version=`sed -n 's/^Version: //p' $(DIR)/debian/tmp-main/DEBIAN/control`; \
-		file=dpkg_$${version}_$(arch).nondebbin.tar; \
-		tar -C $(DIR)/debian/tmp-main -cf $(DIR)/../$${file} usr var; \
-		gzip -9vf $(DIR)/../$${file}; \
-		dpkg-distaddfile -f$(DIR)/debian/files $${file}.gz byhand -
-	dpkg-deb --build debian/tmp-main ..
+	set -e ; for i in ChangeLog TODO copyright ; do \
+		mv $(TMP)/usr/share/doc/dpkg/$$i $(TMP_DPKG)/usr/share/doc/dpkg/ ; \
+	done
+	set -e ; for i in "" ja ; do \
+		install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/man/$$i/man1 ; \
+		for m in md5sum.1 dpkg-deb.1 ; do \
+			if [ -f $(TMP)/usr/share/man/$$i/man1/$$m ] ; then \
+				mv $(TMP)/usr/share/man/$$i/man1/$$m $(TMP_DPKG)/usr/share/man/$$i/man1/$$m ; \
+			fi ; \
+		done ; \
+		install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/man/$$i/man8 ; \
+		for m in dpkg.8 dselect.8 dpkg-split.8 start-stop-daemon.8 \
+			install-info.8 update-alternatives.8 update-rc.d.8 ; do \
+			if [ -f $(TMP)/usr/share/man/$$i/man8/$$m ] ; then \
+				mv $(TMP)/usr/share/man/$$i/man8/$$m $(TMP_DPKG)/usr/share/man/$$i/man8/$$m ; \
+			fi ; \
+		done ; \
+	done
+# Now that dpkg has been installed, Debianize it
+# Policy stuff
+	find $(TMP_DPKG)/usr/share/man -type f | xargs gzip -9f
+	strip $(TMP_DPKG)/usr/bin/* $(TMP_DPKG)/sbin/*
+	mv $(TMP_DPKG)/usr/share/doc/dpkg/ChangeLog \
+		$(TMP_DPKG)/usr/share/doc/dpkg/changelog
+
+	install -p -m 644 -o root -g root debian/changelog \
+		$(TMP_DPKG)/usr/share/doc/dpkg/changelog.Debian
+	gzip -9 $(TMP_DPKG)/usr/share/doc/dpkg/*
+	install -p -m 644 -o root -g root debian/copyright \
+		$(TMP_DPKG)/usr/share/doc/dpkg/
+
+# Final package creation
+	install -d -m 755 -o root -g root $(TMP_DPKG)/DEBIAN
+	install -p -m 755 -o root -g root debian/dpkg.preinst $(TMP_DPKG)/DEBIAN/preinst
+	install -p -m 755 -o root -g root debian/dpkg.prerm $(TMP_DPKG)/DEBIAN/prerm
+	install -p -m 755 -o root -g root debian/dpkg.postinst $(TMP_DPKG)/DEBIAN/postinst
+
+	dpkg-shlibdeps -dPre-Depends -Tdebian/dpkg.substvars \
+		$(TMP_DPKG)/usr/bin/dpkg $(TMP_DPKG)/usr/bin/dselect
+	dpkg-gencontrol -Tdebian/dpkg.substvars -pdpkg -P$(TMP_DPKG)
+	dpkg --build $(TMP_DPKG) ..
+
+binary-dpkg-dev: stamp-binary
+	rm -rf $(TMP_DPKG_DEV)
+	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/lib/dpkg
+	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share
+	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/bin
+	mv $(TMP)/usr/lib/dpkg/parsechangelog $(TMP_DPKG_DEV)/usr/lib/dpkg/
+	mv $(TMP)/usr/lib/dpkg/controllib.pl $(TMP_DPKG_DEV)/usr/lib/dpkg/
+	mv $(TMP)/usr/share/emacs $(TMP_DPKG_DEV)/usr/share/dpkg/
+	set -e ; for i in dpkg-name dpkg-source dpkg-genchanges dpkg-gencontrol \
+		dpkg-shlibdeps dpkg-buildpackage dpkg-distaddfile 822-date \
+		dpkg-scanpackages dpkg-scansources dpkg-architecture \
+		dpkg-parsechangelog ; do \
+		mv $(TMP)/usr/bin/$$i $(TMP_DPKG_DEV)/usr/bin/ ; \
+	done
+	set -e ; for i in "" ja ; do \
+		install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share/man/$$i/man1 ; \
+		for m in dpkg-name.1 dpkg-source.1 822-date.1 dpkg-architecture.1 \
+			dpkg-buildpackage.1 dpkg-distaddfile.1 dpkg-genchanges.1 \
+			dpkg-gencontrol.1 dpkg-parsechangelog.1 dpkg-shlibdeps.1 ; do \
+			if [ -e $(TMP)/usr/share/man/$$i/man1/$$m ] ; then \
+				mv $(TMP)/usr/share/man/$$i/man1/$$m $(TMP_DPKG_DEV)/usr/share/man/$$i/man1/$$m ; \
+			fi ; \
+		done ; \
+		install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share/man/$$i/man5 ; \
+		for m in deb.5 deb-control.5 deb-old.5 ; do \
+			if [ -e $(TMP)/usr/share/man/$$i/man5/$$m ] ; then \
+				mv $(TMP)/usr/share/man/$$i/man5/$$m $(TMP_DPKG_DEV)/usr/share/man/$$i/man5/$$m ; \
+			fi ; \
+		done ; \
+		install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share/man/$$i/man8 ; \
+		for m in dpkg-scanpackages.8 dpkg-scansources.8 ; do \
+			if [ -e $(TMP)/usr/share/man/$$i/man8/$$m ] ; then \
+				mv $(TMP)/usr/share/man/$$i/man8/$$m $(TMP_DPKG_DEV)/usr/share/man/$$i/man8/$$m ; \
+			fi ; \
+		done ; \
+	done
+# Now that dpkg-dev has been installed, Debianize it
+# Policy stuff
+	find $(TMP_DPKG_DEV)/usr/share/man -type f | xargs gzip -9f
+	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share/doc
+	ln -s dpkg $(TMP_DPKG_DEV)/usr/share/doc/dpkg-dev
+
+# Of course our own emacs system
+	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/etc/emacs/site-start.d
+	install -p -m 644 -o root -g root debian/50dpkg-dev.el \
+		$(TMP_DPKG_DEV)/etc/emacs/site-start.d
+	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/lib/emacsen-common/packages/install
+	install -p -m 755 -o root -g root debian/emacsen-common-install \
+		$(TMP_DPKG_DEV)/usr/lib/emacsen-common/packages/install
+	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/lib/emacsen-common/packages/remove
+	install -p -m 755 -o root -g root debian/emacsen-common-remove \
+		$(TMP_DPKG_DEV)/usr/lib/emacsen-common/packages/remove
+
+# Final package creation
+	install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/DEBIAN
+	install -p -m 644 -o root -g root debian/dpkg-dev.conffiles $(TMP_DPKG_DEV)/DEBIAN/conffiles
+	install -p -m 755 -o root -g root debian/dpkg-dev.prerm $(TMP_DPKG_DEV)/DEBIAN/prerm
+	install -p -m 755 -o root -g root debian/dpkg-dev.postinst $(TMP_DPKG_DEV)/DEBIAN/postinst
+
+	dpkg-gencontrol -Tdebian/dpkg-dev.substvars -pdpkg-dev -P$(TMP_DPKG_DEV)
+	dpkg --build $(TMP_DPKG_DEV) ..
+
+binary-dpkg-doc: stamp-binary
+	rm -rf $(TMP_DPKG_DOC)
+	install -d -m 755 -o root -g root $(TMP_DPKG_DOC)/usr/share/doc/dpkg
+	mv $(TMP)/usr/share/doc/dpkg/internals $(TMP_DPKG_DOC)/usr/share/doc/dpkg/
+	mv $(TMP)/usr/share/doc/dpkg/ChangeLog.manuals \
+		$(TMP_DPKG_DOC)/usr/share/doc/dpkg/changelog.manuals
+
+# Now that dpkg-dev has been installed, Debianize it
+# Policy stuff
+	gzip -9f $(TMP_DPKG_DOC)/usr/share/doc/dpkg/[^i]*
+	ln -s dpkg $(TMP_DPKG_DOC)/usr/share/doc/dpkg-doc
+
+# Register documentation with doc-base
+	install -d -m 755 -o root -g root $(TMP_DPKG_DOC)/usr/share/doc-base
+	install -p -m 644 -o root -g root debian/dpkg-doc.doc-base \
+		$(TMP_DPKG_DOC)/usr/share/doc-base/dpkg-doc
+	
+# Final package creation
+	install -d -m 755 -o root -g root $(TMP_DPKG_DOC)/DEBIAN
+	install -p -m 755 -o root -g root debian/dpkg-doc.prerm $(TMP_DPKG_DOC)/DEBIAN/prerm
+	install -p -m 755 -o root -g root debian/dpkg-doc.postinst $(TMP_DPKG_DOC)/DEBIAN/postinst
+
+	dpkg-gencontrol -Tdebian/dpkg-dev.substvars -pdpkg-doc -P$(TMP_DPKG_DOC)
+	dpkg --build $(TMP_DPKG_DOC) ..
+
+binary-arch: binary-dpkg
+	set -e ; \
+	v=`sed -n 's/^Version: //p' $(TMP_DPKG)/DEBIAN/control`; \
+	f=dpkg-$${v}_$(arch).nondebbin.tar ; \
+	tar -C $(TMP_DPKG) -cf $(DIR)/../$$f usr var ; \
+	gzip -9f ../$$f ; \
+	dpkg-distaddfile -fdebian/files $$f.gz byhand -
+
+binary-indep: binary-dpkg-dev binary-dpkg-doc
+	set -e ; set -x ; \
+	v=`sed -n 's/^Version: //p' $(TMP_DPKG_DEV)/DEBIAN/control`; \
+	f=dpkg-$${v}_$(arch).tar.gz ; \
+	if [ -f ../dpkg_$${v}.tar.gz ] ; then \
+	    	cp ../dpkg_$${v}.tar.gz ../$$f ; \
+		dpkg-distaddfile -fdebian/files  $$f byhand - ; \
+	fi
 
 define checkdir
 	test -f include/dpkg.h.in
 endef
+
+.PHONY: clean build binary binary-arch binary-indep binary-dpkg binary-dpkg-dev
+.PHONY: binary-dpkg-doc binary-nondebbin

debian/shlibs

@@ -1 +0,0 @@
-libdpkg 0		dpkg (>= 1.4.0.9)

debian/shlibs.local

@@ -1 +0,0 @@
-libdpkg 0

doc/.cvsignore

@@ -1,2 +1 @@
-Makefile.in
-manuals-version
+Makefile

doc/Makefile.am

@@ -1,90 +0,0 @@
-## Process this file with automake to produce a Makefile.in
-
-AUTOMAKE_OPTIONS	= 1.1 foreign
-
-## Directory definitions
-
-docdir			= $(datadir)/doc
-pkgdocdir		= $(docdir)/@PACKAGE@
-
-## Subdirectories with translations
-
-SUBDIRS			= ja
-
-## Automake variables
-
-man_MANS		= deb.5 deb-old.5 deb-control.5
-pkgdoc_DATA		= 
-EXTRA_DIST		= database-structure.fig ChangeLog \
-			  $(SGMLFILES) $(man_MANS)
-
-HTMLDIRS		= internals.html 
-SGMLFILES		= internals.sgml
-HARDCOPY		= internals.ps internals.html internals.info
-
-CLEANFILES		= $(srcdir)/manuals-version.new
-DISTCLEANFILES		= manuals-version
-INFOFILES		= internals.info
-
-## Rules
-
-#SUFFIXES		= .html .sgml .ps .fig .monops
-
-.PHONY: all install-data-local uninstall-local dist-hook clean-local
-
-all:
-	@echo Nothing built by default, use \`make internals\' to build docs
-
-internals.sgml: $(srcdir)/manuals-version
-
-internals: $(HARDCOPY)
-
-$(srcdir)/manuals-version: $(top_srcdir)/debian/changelog
-	v=`dpkg-parsechangelog -l$< | sed -n 's/^Version: //p'` && \
-	echo "<!entity manuals-version \"$$v\">" >$@.new
-	echo "<!entity dpkg-version \"$(VERSION)\">" >>$@.new
-	(cmp -s $@.new $@ || mv -f $@.new $@) && rm -f $@.new
-
-internals.texinfo: internals.sgml
-	debiandoc2texinfo $<
-
-internals.ps: internals.sgml
-	debiandoc2ps -1 $<
-
-internals.dvi: internals.sgml
-	debiandoc2dvi $<
-
-internals.info: internals.sgml
-	debiandoc2info $<
-
-internals.html: $(srcdir)/internals.sgml
-	debiandoc2html $<
-
-database-structure.ps: database-structure.fig
-	fig2dev -L ps -c -l _ -P <$< >ps
-	mv -f ps $@
-
-database-structure.monops: database-structure.ps
-	perl -pe 's:^/(col[0-7]) \{[01 ]*1[01 ]* setrgbcolor\}\
- bind def$$::/$$1 {} bind def:' $< >ps
-	mv -f ps $@
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
-	$(INSTALL_DATA) $(top_srcdir)/debian/changelog $(DESTDIR)$(pkgdocdir)/changelog
-	$(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(pkgdocdir)/changelog.manuals
-
-internals-install: $(HARDCOPY)
-	$(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
-	set -e; for f in internals.ps internals.html; do \
-		cp -r $$f $(DESTDIR)$(pkgdocdir)/`basename $$f`; \
-	done
-	$(mkinstalldirs) $(DESTDIR)$(infodir)
-	$(INSTALL_DATA) internals.info $(DESTDIR)$(infodir)
-
-doc-clean:
-	-$(RM) *.{aux,cp,dvi,fn,ky,log,pg,toc,tp,vr,bak}
-	-$(RM) internals.{FN,fns,sgmls,texi*,info*}
-	-$(RM) manuals-version*
-
-## End of file.

doc/Makefile.in

@@ -0,0 +1,55 @@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+top_srcdir	= @top_srcdir@
+
+SUBDIRS		= ja
+
+include ../Makefile.conf
+
+MAN5PAGES	= deb-control.5 deb-old.5 deb.5
+
+all: internals.html all-recursive
+
+clean: clean-recursive
+	$(RM) $(srcdir)/manuals-version
+	$(RM) -rf internals.html/
+
+cvsclean: clean cvsclean-recursive
+	$(RM) Makefile
+
+install: install-doc
+
+manuals-version: $(top_srcdir)/version-nr
+	v=`sed -ne 1s/.*(\(.*\)).*/\1/ $(srcdir)/ChangeLog` ; \
+	echo "<!entity manuals-version \"$$v)\">" > $@
+	echo "<!entity dpkg-version \"$(VERSION)\">" >> $@
+
+internals.html: internals.sgml manuals-version
+	debiandoc2html -n -D. $<
+
+install-doc: install-doc-recursive
+	$(mkinstalldirs) $(DESTDIR)$(man5dir) 
+	set -e ; for i in $(MAN5PAGES) ; do \
+		if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+		$(INSTALL_DATA) $$d$$i $(DESTDIR)$(man5dir) ; \
+	done
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/internals/
+	set -e ; for i in internals.html/* ; do \
+		bn=`basename $$i` ; \
+		$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/internals/$$bn ; \
+	done
+	$(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(docdir)/ChangeLog.manuals
+	set -e ; for i in ChangeLog TODO ; do \
+		$(INSTALL_DATA) $(top_srcdir)/$$i $(DESTDIR)$(docdir) ; \
+	done
+	$(INSTALL_DATA) $(top_srcdir)/COPYING $(DESTDIR)$(copyingfile)
+
+all-recursive install-recursive install-doc-recursive clean-recursive cvsclean-recursive:
+	set -e ; target=`echo $@ | $(SED) s/-recursive//`; \
+		for s in $(SUBDIRS) ; do \
+		$(MAKE) $(MFLAGS) -C $$s $$target ; \
+	done;
+
+.PHONY: all clean cvsclean install install-doc
+.PHONY: all-recursive clean-recursive cvsclean-recursive install-recursive
+.PHONY: install-doc-recursive

doc/ja/Makefile.am

@@ -1,13 +0,0 @@
-## Process this file with automake to produce a Makefile.in
-
-AUTOMAKE_OPTIONS	= 1.1 foreign
-
-override mandir			:=$(mandir)/ja
-
-## Automake variables
-
-man_MANS		= deb.5 deb-old.5 \
-			  dpkg-deb.1 md5sum.1 \
-			  dpkg.8 dselect.8 install-info.8 start-stop-daemon.8 \
-			  update-alternatives.8 update-rc.d.8
-

doc/ja/Makefile.in

@@ -1,332 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AS = @AS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CWARNS = @CWARNS@
-CXX = @CXX@
-DATADIRNAME = @DATADIRNAME@
-DLLTOOL = @DLLTOOL@
-EMACS = @EMACS@
-GENCAT = @GENCAT@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GT_NO = @GT_NO@
-GT_YES = @GT_YES@
-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
-INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-LD = @LD@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-NM = @NM@
-OBJDUMP = @OBJDUMP@
-OPTCFLAGS = @OPTCFLAGS@
-PACKAGE = @PACKAGE@
-POFILES = @POFILES@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-l = @l@
-lispdir = @lispdir@
-perlpath = @perlpath@
-
-AUTOMAKE_OPTIONS = 1.1 foreign
-
-man_MANS = deb.5 deb-old.5 			  dpkg-deb.1 md5sum.1 			  dpkg.8 dselect.8 install-info.8 start-stop-daemon.8 			  update-alternatives.8 update-rc.d.8
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-man1dir = $(mandir)/man1
-man5dir = $(mandir)/man5
-man8dir = $(mandir)/man8
-MANS = $(man_MANS)
-
-NROFF = nroff
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/ja/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-install-man1:
-	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-	done
-
-uninstall-man1:
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
-	done
-
-install-man5:
-	$(mkinstalldirs) $(DESTDIR)$(man5dir)
-	@list='$(man5_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.5*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \
-	done
-
-uninstall-man5:
-	@list='$(man5_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.5*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man5dir)/$$inst; \
-	done
-
-install-man8:
-	$(mkinstalldirs) $(DESTDIR)$(man8dir)
-	@list='$(man8_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.8*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
-	done
-
-uninstall-man8:
-	@list='$(man8_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.8*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
-	done
-install-man: $(MANS)
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-man1 install-man5 install-man8
-uninstall-man:
-	@$(NORMAL_UNINSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1 uninstall-man5 uninstall-man8
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = doc/ja
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign doc/ja/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-man
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-man
-uninstall: uninstall-am
-all-am: Makefile $(MANS)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 \
-		$(DESTDIR)$(mandir)/man8
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: install-man1 uninstall-man1 install-man5 uninstall-man5 \
-install-man8 uninstall-man8 install-man uninstall-man tags distdir \
-info-am info dvi-am dvi check check-am installcheck-am installcheck \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-override mandir			:=$(mandir)/ja
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

dpkg-deb/Makefile.am

@@ -1,36 +0,0 @@
-## Process this file with automake to produce a Makefile.in
-
-AUTOMAKE_OPTIONS	= 1.1 foreign
-
-## Directory definitions
-
-localedir		= $(datadir)/locale
-
-## Various options
-
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
-LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
-LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
-
-CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
-OPTCXXFLAGS		= @CXXFLAGS @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
-
-DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
-			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
-
-## Automake variables
-
-MAINTAINERCLEANFILES	= $(srcdir)/Makefile.in
-EXTRA_DIST		= dpkg-deb.1
-
-## Rules
-
-bin_PROGRAMS		= dpkg-deb
-man_MANS		= dpkg-deb.1
-
-dpkg_deb_SOURCES	= main.c build.c extract.c info.c dpkg-deb.h
-dpkg_deb_LDADD		= ../lib/libdpkg.la ../lib/myopt.o
-
-## End of file.

dpkg-deb/Makefile.in

@@ -0,0 +1,42 @@
+
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+top_srcdir	= @top_srcdir@
+
+include ../Makefile.conf
+
+SOURCES		= build.c extract.c info.c main.c
+
+OBJECTS		= $(patsubst %.c, %.o, $(SOURCES))
+GENFILES	= $(OBJECTS) dpkg-deb
+
+.PHONY: all
+all:: dpkg-deb
+
+.PHONY: install
+install:: all
+
+.PHONY: clean
+clean::
+	$(RM) $(GENFILES)
+
+.PHONY: cvsclean
+cvslean:: clean
+	$(RM) Makefile
+
+.PHONY: install
+install:: install-program install-doc
+
+.PHONY: install-program
+install-program:
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(INSTALL) dpkg-deb $(DESTDIR)$(bindir)
+
+.PHONY: install-doc
+install-doc:
+	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+	$(INSTALL_DATA) $(srcdir)/dpkg-deb.1 $(DESTDIR)$(man1dir)
+
+dpkg-deb: $(OBJECTS) ../lib/libdpkg.a
+	$(CC) $(LDFLAGS) -L../lib -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS) -ldpkg
+

dselect/Makefile.am

@@ -1,74 +0,0 @@
-## Process this file with automake to produce a Makefile.in
-
-AUTOMAKE_OPTIONS	= 1.1 foreign
-
-## Directory definitions
-
-localedir		= $(datadir)/locale
-
-## Various options
-
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
-LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
-
-CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-
-DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
-			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
-## Automake variables
-
-bin_PROGRAMS		= dselect
-man_MANS		= dselect.8
-
-EXTRA_DIST		= keyoverride mkcurkeys.pl mkhelpmsgs.pl helpmsgs.src \
-			  checkunimp.pl $(man_MANS)
-
-dselect_SOURCES		= main.cc bindings.cc curkeys.cc helpmsgs.cc \
-			  basecmds.cc baselist.cc basetop.cc \
-			  pkgcmds.cc pkgdepcon.cc pkgdisplay.cc pkginfo.cc \
-			  pkgkeys.cc pkglist.cc pkgsublist.cc pkgtop.cc \
-			  methkeys.cc method.cc methparse.cc methlist.cc \
-			  dselect.h bindings.h pkglist.h method.h
-dselect_LDADD		= ../lib/libdpkg.la ../lib/myopt.o -lncurses
-
-
-BUILT_SOURCES		= curkeys.h helpmsgs.h helpmsgs.cc
-CLEANFILES		= curkeys.h.new helpmsgs.h.new helpmsgs.cc.new $(BUILT_SOURCES)
-
-DISTCLEANFILES		= updates status available *.old
-MAINTAINERCLEANFILES	= $(srcdir)/Makefile.in
-
-## Rules
-
-helpmsgs.h helpmsgs.cc: helpmsgs.src $(srcdir)/mkhelpmsgs.pl
-	perl $(srcdir)/mkhelpmsgs.pl $<
-
-curkeys.h: keyoverride $(srcdir)/mkcurkeys.pl
-	cursesfile=`echo '#include <curses.h>' | \
-		 $(CC) -E - | grep 'curses.h' | head -1 | \
-		 sed -e 's/^[^"]*"//; s/".*$$//'`; \
-	if [ "$$cursesfile" == "" ]; then echo "can't find curses file"; exit 1; fi; \
-	perl $(srcdir)/mkcurkeys.pl $< $$cursesfile > $@.new
-	mv $@.new $@
-
-$(DEP_FILES): helpmsgs.h curkeys.h
-
-## Optimize for speed, not space, for most commonly used files
-
-pkgdepcon.o: pkgdepcon.cc
-	$(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(OPTCXXFLAGS) -c $<
-
-pkgdisplay.o: pkgdisplay.cc
-	$(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(OPTCXXFLAGS) -c $<
-
-curkeys.o: curkeys.cc
-	$(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(OPTCXXFLAGS) -c $<
-
-dist-hook:
-	cp -p helpmsgs.h helpmsgs.cc curkeys.h $(distdir)/
-
-## End of file.

dselect/Makefile.in

@@ -0,0 +1,61 @@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+top_srcdir	= @top_srcdir@
+
+include ../Makefile.conf
+
+CXX_SOURCES	= basecmds.cc baselist.cc basetop.cc bindings.cc curkeys.cc \
+		  main.cc methkeys.cc methlist.cc method.cc methparse.cc \
+		  pkgcmds.cc pkgdepcon.cc pkgdisplay.cc pkginfo.cc pkgkeys.cc \
+		  pkglist.cc pkgsublist.cc pkgtop.cc helpmsgs.cc
+
+MAN8PAGES	= dselect.8
+
+OBJECTS		= $(patsubst %.cc, %.o, $(CXX_SOURCES))
+GENFILES	= $(OBJECTS) dselect helpmsgs.h
+
+.PHONY: all
+all:: dselect
+
+.PHONY: install
+install:: all
+
+.PHONY: clean
+clean::
+	$(RM) $(GENFILES)
+
+.PHONY: cvsclean
+cvslean:: clean
+	$(RM) Makefile
+
+.PHONY: install
+install:: install-program install-doc
+
+.PHONY: install-program
+install-program:
+	$(mkinstalldirs) $(DESTDIR)/$(bindir)
+	$(INSTALL) dselect $(DESTDIR)/$(bindir)
+
+.PHONY: install-doc
+install-doc:
+	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
+	set -e ; for i in $(MAN8PAGES) ; do \
+	    if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+	    $(INSTALL_DATA) $$d$$i $(DESTDIR)/$(man8dir) ; \
+	done
+
+dselect: $(OBJECTS) ../lib/libdpkg.a
+	$(CC) $(LDFLAGS) -L../lib -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS) -ldpkg -lncurses
+
+basecmds.o: helpmsgs.h
+curkeys.o: curkeys.h
+
+helpmsgs.h helpmsgs.cc: helpmsgs.src $(srcdir)/mkhelpmsgs.pl
+	perl $(srcdir)/mkhelpmsgs.pl $<
+
+curkeys.h: keyoverride $(srcdir)/mkcurkeys.pl
+	cursesfile=`echo '#include <curses.h>' | \
+		 $(CC) -E - | grep 'curses.h' | head -1 | \
+		 $(SED) -e 's/^[^"]*"//; s/".*$$//'`; \
+	if [ "$$cursesfile" == "" ]; then echo "can't find curses file"; exit 1; fi; \
+	perl $(srcdir)/mkcurkeys.pl $< $$cursesfile > $@

include/Makefile.am

@@ -1,52 +0,0 @@
-## Process this file with automake to produce a Makefile.in
-
-AUTOMAKE_OPTIONS	= 1.1 foreign
-
-## Directory definitions
-
-pkgincludedir		= $(includedir)/@PACKAGE@
-pkglocalstatedir	= $(localstatedir)/@PACKAGE@
-pkgsysconfdir		= $(sysconfdir)/@PACKAGE@
-
-methods_suffix		= methods
-pinfo_suffix		= info
-pupdates_suffix		= updates
-parts_suffix		= parts
-
-## Automake variables
-
-pkginclude_HEADERS	= dpkg.h dpkg-db.h tarfn.h
-noinst_HEADERS		= myopt.h
-EXTRA_DIST		= dpkg.h.in
-
-BUILT_SOURCES		= # dpkg.h
-CLEANFILES		= dpkg.h dpkg.h.new $(BUILT_SOURCES)
-
-MAINTAINERCLEANFILES	= $(srcdir)/Makefile.in
-
-## Rules
-
-.PHONY: install-data-local uninstall-local
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(pkglocalstatedir)/{$(pinfo_suffix),$(pupdates_suffix)}
-
-uninstall-local:
-	-for d in $(pkglocalstatedir)/{$(pinfo_suffix),$(pupdates_suffix)} \
-		$(pkgincludedir) $(pkglocalstatedir) $(pkglocalstatedir); do \
-		[ -e $$d ] && rmdir $(DESTDIR)$$d; \
-	done
-
-dpkg.h: stamp-dpkg.h
-stamp-dpkg.h: dpkg.h.in Makefile
-	sed 's:^\(#define ADMINDIR[ 	]*"\).*\(".*\):\1$(pkglocalstatedir)\2:; \
-		s:^\(#define UPDATESDIR[ 	]*"\).*\(".*\):\1$(pupdates_suffix)/\2:; \
-		s:^\(#define INFODIR[ 	]*"\).*\(".*\):\1$(pinfo_suffix)/\2:; \
-		s:^\(#define PARTSDIR[ 	]*"\).*\(".*\):\1$(parts_suffix)/\2:; \
-		s:^\(#define LIBDIR[ 	]*"\).*\(".*\):\1$(pkglibdir)/\2:; \
-		s:^\(#define METHODSDIR[ 	]*"\).*\(".*\):\1$(methods_suffix)\2:' \
-		< $< > dpkg.h.new
-	(cmp -s dpkg.h.new dpkg.h) || mv -f dpkg.h.new dpkg.h
-	touch $@
-
-## End of file.

include/Makefile.in

@@ -0,0 +1,22 @@
+
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+
+GENFILES	= dpkg.h
+
+include ../Makefile.conf
+
+all:: $(GENFILES)
+	
+install:: all
+
+clean::
+	rm -f $(GENFILES) 
+
+cvslean:: clean
+	rm -f Makefile
+
+dpkg.h: dpkg.h.in
+	sed 's,#ADMINDIR#,$(admindir),; s,#LIBDIR#,$(dpkglibdir),;' $< > $@
+
+.PHONY: all install clean cvsclean

lib/Makefile.am

@@ -1,43 +0,0 @@
-## Process this file with automake to produce a Makefile.in
-
-AUTOMAKE_OPTIONS	= 1.1 foreign
-
-## Directory definitions
-
-docdir			= $(prefix)/doc
-pkgdocdir		= $(docdir)/@PACKAGE@
-copyingfile		= $(pkgdocdir)/copyright
-
-## Various options
-
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
-LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
-LIBS			= @LIBS@ $(XLIBS)
-
-CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
-OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
-
-DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
-			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@ \
-			  -DCOPYINGFILE=\"$(copyingfile)\"
-
-## Automake variables
-
-lib_LTLIBRARIES		= libdpkg.la
-noinst_OBJECTS		= myopt.o
-
-libdpkg_la_SOURCES	= ehandle.c mlib.c parse.c parsehelp.c fields.c dump.c \
-			  nfmalloc.c varbuf.c database.c vercmp.c \
-			  compat.c lock.c dbmodify.c showcright.c \
-			  tarfn.c parsedump.h
-libdpkg_la_LDFLAGS	= -version-info 0:0:0 -rpath $(libdir)
-
-EXTRA_DIST		= myopt.c
-
-all: myopt.o
-
-MAINTAINERCLEANFILES	= $(srcdir)/Makefile.in
-
-## End of file.

lib/Makefile.in

@@ -0,0 +1,34 @@
+
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+top_srcdir	= @top_srcdir@
+
+include ../Makefile.conf
+
+SOURCES		= compat.c database.c dbmodify.c dump.c ehandle.c fields.c \
+		    lock.c mlib.c myopt.c nfmalloc.c parse.c parsehelp.c \
+		    showcright.c tarfn.c varbuf.c vercmp.c
+
+OBJECTS		= $(patsubst %.c, %.o, $(SOURCES))
+GENFILES	= $(OBJECTS) libdpkg.a
+
+ALL_CFLAGS	+= -DCOPYINGFILE=\"$(copyingfile)\"
+
+.PHONY: all
+all:: libdpkg.a
+	
+libdpkg.a: $(OBJECTS)
+	$(AR) r $@ $^
+
+.PHONY: install
+install:: all
+
+.PHONY: clean
+clean::
+	$(RM) $(GENFILES)
+
+
+.PHONY: cvsclean
+cvslean:: clean
+	$(RM) Makefile
+

main/Makefile.am

@@ -1,59 +0,0 @@
-## Process this file with automake to produce a Makefile.in
-
-AUTOMAKE_OPTIONS	= 1.1 foreign
-
-## Directory definitions
-
-localedir		= $(datadir)/locale
-
-## Various options
-
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
-LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
-
-CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-
-DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
-			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
-
-## Automake variables
-
-bin_PROGRAMS		= dpkg
-man_MANS		= dpkg.8
-
-dpkg_SOURCES		= main.c enquiry.c filesdb.c archives.c processarc.c \
-			  cleanup.c select.c packages.c configure.c remove.c \
-			  help.c depcon.c errors.c update.c main.h filesdb.h \
-			  archives.h
-dpkg_LDADD		= ../lib/libdpkg.la ../lib/myopt.o
-
-BUILT_SOURCES		= archtable.h
-CLEANFILES		= archtable.h.new $(BUILT_SOURCES)
-
-DISTCLEANFILES		= updates status available *.old
-MAINTAINERCLEANFILES	= $(srcdir)/Makefile.in
-
-EXTRA_DIST		= dpkg.8
-
-## Rules
-
-filesdb.o: filesdb.c
-	$(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(OPTCFLAGS) -c $<
-
-$(DEP_FILES): archtable.h
-
-archtable.h: $(top_srcdir)/archtable
-	expand $(top_srcdir)/archtable | \
-	 perl -ne 'print "  { \"$$1\",$$2\"$$3\",$$4\"$$5\" },\n" \
-		   if m/^\s*(\w+)(\s+)(\w+)(\s+)(\w+)\s*$$/' \
-		>$@.new
-	mv $@.new $@
-
-dist-hook:
-	cp -p  archtable.h $(distdir)/
-
-## End of file.

main/Makefile.in

@@ -0,0 +1,58 @@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+top_srcdir	= @top_srcdir@
+
+include ../Makefile.conf
+
+SOURCES		= main.c enquiry.c filesdb.c archives.c processarc.c \
+		  cleanup.c select.c packages.c configure.c remove.c \
+		  help.c depcon.c errors.c update.c 
+
+MAN8PAGES	= dpkg.8
+
+OBJECTS		= $(patsubst %.c, %.o, $(SOURCES))
+GENFILES	= $(OBJECTS) archtable.h dpkg
+
+.PHONY: all
+all:: dpkg
+
+.PHONY: install
+install:: all
+
+.PHONY: clean
+clean::
+	$(RM) $(GENFILES)
+
+.PHONY: cvsclean
+cvslean:: clean
+	$(RM) Makefile
+
+.PHONY: install
+install:: install-program install-doc
+
+.PHONY: install-program
+install-program:
+	$(mkinstalldirs) $(DESTDIR)/$(bindir)
+	$(INSTALL) dpkg $(DESTDIR)/$(bindir)
+	$(mkinstalldirs) $(DESTDIR)/$(admindir)/alternatives
+	$(mkinstalldirs) $(DESTDIR)/$(admindir)/info
+	$(mkinstalldirs) $(DESTDIR)/$(admindir)/updates
+
+.PHONY: install-doc
+install-doc:
+	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
+	set -e ; for i in $(MAN8PAGES) ; do \
+	    if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+	    $(INSTALL_DATA) $$d$$i $(DESTDIR)/$(man8dir) ; \
+	done
+
+dpkg: $(OBJECTS) ../lib/libdpkg.a
+	$(CC) $(LDFLAGS) -L../lib -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS) -ldpkg
+
+enquiry.o: archtable.h
+
+archtable.h: $(top_srcdir)/archtable
+	expand $< | \
+	 perl -ne 'print "  { \"$$1\",$$2\"$$3\",$$4\"$$5\" },\n" \
+		   if m/^\s*(\w+)(\s+)(\w+)(\s+)(\w+)\s*$$/' \
+		>$@

md5sum/Makefile.am

@@ -1,33 +0,0 @@
-## Process this file with automake to produce a Makefile.in
-
-AUTOMAKE_OPTIONS	= 1.1 foreign
-
-## Directory definitions
-
-localedir		= $(datadir)/locale
-
-## Various options
-
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
-LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
-
-CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-
-DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
-			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
-
-MAINTAINERCLEANFILES	= $(srcdir)/Makefile.in
-
-## Automake variables
-
-bin_PROGRAMS		= md5sum
-man_MANS		= md5sum.1
-
-md5sum_SOURCES		= md5.c md5sum.c md5.h
-EXTRA_DIST		= md5sum.1
-
-## End of file.

methods/.cvsignore

@@ -1 +1 @@
-Makefile.in
+Makefile

methods/Makefile.in

@@ -0,0 +1,43 @@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+top_srcdir	= @top_srcdir@
+
+include ../Makefile.conf
+
+# Available methods
+METHODS			= disk floppy
+# Scripts each method must have
+METHOD_SCRIPTS		= setup update install
+
+.PHONY: all
+all:: 
+
+.PHONY: install
+install:: all install-program install-doc
+
+.PHONY: clean
+clean::
+
+.PHONY: cvsclean
+cvslean:: clean
+	$(RM) Makefile
+
+.PHONY: install-program
+install-program:
+	$(mkinstalldirs) $(DESTDIR)$(methodsdir)
+	set -e ; for m in $(METHODS) ; do \
+		$(mkinstalldirs) $(DESTDIR)$(admindir)/methods/$$m ; \
+		$(mkinstalldirs) $(DESTDIR)$(methodsdir)/$$m ; \
+		for s in $(METHOD_SCRIPTS) ; do \
+		    	$(INSTALL_SCRIPT) $(srcdir)/$$m.$$s $(DESTDIR)$(methodsdir)/$$m/$$s ; \
+		done ; \
+		$(INSTALL_DATA) $(srcdir)/$$m.names $(DESTDIR)$(methodsdir)/$$m/names ; \
+		for n in `cut -d ' ' -f 2 $(srcdir)/$$m.names` ; do \
+			rn=`echo $$n | $(SED) -e 's,\.,/,'` ; \
+			$(INSTALL_DATA) $(srcdir)/$$m.desc.$$n $(DESTDIR)$(methodsdir)/$$m/desc.$$n ; \
+		done ; \
+	done
+
+.PHONY: install-doc
+install-doc:
+

po/POTFILES.in

@@ -1,59 +0,0 @@
-# This is the list of all source files with translatable strings.
-
-lib/compat.c
-lib/database.c
-lib/dbmodify.c
-lib/dump.c
-lib/ehandle.c
-lib/fields.c
-lib/lock.c
-lib/mlib.c
-lib/myopt.c
-lib/parse.c
-lib/parsehelp.c
-lib/showcright.c
-lib/varbuf.c
-
-main/archives.c
-main/cleanup.c
-main/configure.c
-main/depcon.c
-main/enquiry.c
-main/errors.c
-main/filesdb.c
-main/help.c
-main/main.c
-main/packages.c
-main/processarc.c
-main/remove.c
-main/select.c
-main/update.c
-
-dpkg-deb/build.c
-dpkg-deb/extract.c
-dpkg-deb/info.c
-dpkg-deb/main.c
-
-split/info.c
-split/join.c
-split/main.c
-split/queue.c
-split/split.c
-
-md5sum/md5sum.c
-
-dselect/basecmds.cc
-dselect/baselist.cc
-dselect/bindings.cc
-dselect/main.cc
-dselect/methlist.cc
-dselect/method.cc
-dselect/methparse.cc
-dselect/pkgcmds.cc
-dselect/pkgdepcon.cc
-dselect/pkgdisplay.cc
-dselect/pkginfo.cc
-dselect/pkglist.cc
-dselect/pkgsublist.cc
-dselect/pkgtop.cc
-

scripts/Makefile.am

@@ -1,93 +0,0 @@
-## Process this file with automake to produce a Makefile.in
-
-AUTOMAKE_OPTIONS	= 1.1 foreign
-
-## Directory definitions
-
-pkglibdir		= $(libdir)/@PACKAGE@
-pkglocalstatedir	= $(sharedstatedir)/@PACKAGE@
-
-parsechangelogdir	= $(pkglibdir)/parsechangelog
-altssysconfdir		= $(pkgsysconfdir)/alternatives
-altslocalstatedir	= $(pkglocalstatedir)/alternatives
-
-# This should be $(pkgsysconfdir), but uses $(sysconfdir) for backwards compatibility.
-altssysconfdir		= $(sysconfdir)/alternatives
-
-
-## Automake variables
-
-bin_SCRIPTS		= dpkg-name dpkg-source dpkg-genchanges dpkg-gencontrol \
-			  dpkg-shlibdeps dpkg-buildpackage dpkg-parsechangelog \
-			  dpkg-distaddfile 822-date dpkg-scanpackages \
-			  dpkg-scansources dpkg-architecture
-
-sbin_SCRIPTS		= update-rc.d update-alternatives \
-			  install-info dpkg-divert cleanup-info
-
-pkglib_SCRIPTS		= controllib.pl
-
-lisp_LISP		= debian-changelog-mode.el
-ELCFILES		= debian-changelog-mode.elc
-
-man_MANS		= dpkg-name.1 dpkg-source.1 822-date.1 update-rc.d.8 \
-			  update-alternatives.8 \
-			  install-info.8 dpkg-scanpackages.8 \
-			  dpkg-scansources.8 dpkg-architecture.1
-
-EXTRA_DIST		= update-rc.d.pl \
-			  dpkg-name.sh dpkg-source.pl dpkg-genchanges.pl \
-			  dpkg-gencontrol.pl dpkg-shlibdeps.pl \
-			  dpkg-buildpackage.sh dpkg-parsechangelog.pl \
-			  dpkg-distaddfile.pl 822-date.pl dpkg-scanpackages.pl \
-			  update-alternatives.pl install-info.pl dpkg-divert.pl \
-			  cleanup-info.pl controllib.pl debian-changelog-mode.el \
-			  cl-debian.pl dpkg-architecture.pl dpkg-scansources.pl \
-			  $(man_MANS) README.alternatives
-
-noinst_DATA		= cl-debian
-
-LSMANL			= dpkg-gencontrol dpkg-genchanges dpkg-buildpackage \
-			  dpkg-distaddfile dpkg-parsechangelog dpkg-shlibdeps
-
-CLEANFILES		= $(bin_SCRIPTS) $(sbin_SCRIPTS) $(noinst_DATA) $(ELCFILES)
-MAINTAINERCLEANFILES	= $(srcdir)/Makefile.in $(srcdir)/elisp-comp
-
-## Rules
-
-.PHONY: install-data-local uninstall-local
-
-SUFFIXES		= .pl .sh
-
-dpkg-scansources.8: dpkg-scansources.pl
-	pod2man --section=8 $^ > $@
-
-%: %.pl
-	sed -e "s:^#![:space:]*/usr/bin/perl:#! $(perlpath):; \
-		s:\$$dpkglibdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$dpkglibdir=\"$(pkglibdir)\":; \
-		s:\$$version[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:\$$version=\"$(VERSION)\":" \
-		< $< > $@.new
-	chmod 755 $@.new
-	mv $@.new $@
-
-%: %.sh 
-	sed -e "s:version=\"[^\"]*\":version=\"$(VERSION)\":" \
-		< $< > $@.new
-	chmod 755 $@.new
-	mv $@.new $@
-
-install-data-local: cl-debian
-	$(mkinstalldirs) $(DESTDIR)$(altslocalstatedir) $(DESTDIR)$(altssysconfdir)
-	$(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(altssysconfdir)/README
-	set -e; for f in $(LSMANL); do ln -sf $(mandir)/man1/dpkg-source.1 $(DESTDIR)$(mandir)/man1/$$f.1; done
-	$(mkinstalldirs) $(DESTDIR)$(parsechangelogdir)
-	$(INSTALL_PROGRAM) cl-debian $(DESTDIR)$(parsechangelogdir)/debian
-
-uninstall-local:
-	$(RM) $(DESTDIR)$(parsechangelogdir)/debian
-	-[ -e $(DESTDIR)$(parsechangelogdir) ] && rmdir $(DESTDIR)$(parsechangelogdir)
-	set -e; for f in $(LSMANL); do $(RM) $(DESTDIR)$(mandir)/man1/$$f.1; done
-	-[ -e $(DESTDIR)$(altssysconfdir) ] && rmdir $(DESTDIR)$(altssysconfdir)
-	-[ -e $(DESTDIR)$(altslocalstatedir) ] && rmdir $(DESTDIR)$(altslocalstatedir)
-
-## End of file.

scripts/Makefile.in

@@ -0,0 +1,107 @@
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+top_srcdir	= @top_srcdir@
+
+include ../Makefile.conf
+
+BIN_SCRIPTS		= dpkg-name dpkg-source dpkg-genchanges \
+			  dpkg-gencontrol dpkg-shlibdeps dpkg-buildpackage \
+			  dpkg-parsechangelog dpkg-distaddfile 822-date \
+			  dpkg-scanpackages dpkg-scansources dpkg-architecture
+
+SBIN_SCRIPTS		= update-rc.d update-alternatives install-info \
+			  dpkg-divert cleanup-info
+
+MAN1PAGES		= dpkg-name.1 dpkg-source.1 822-date.1 dpkg-architecture.1
+MAN8PAGES		= update-rc.d.8 update-alternatives.8 install-info.8  \
+			  dpkg-scanpackages.8 dpkg-scansources.8
+
+CHANGELOG_PARSERS	= cl-debian
+
+SCRIPTLIBS		= controllib.pl
+
+LISPFILES		= debian-changelog-mode.el
+
+GEN_MAN8PAGES		= dpkg-scansources.8
+
+MAN_SOURCE_ALIASES	= dpkg-gencontrol.1 dpkg-genchanges.1 dpkg-buildpackage.1 \
+			  dpkg-distaddfile.1 dpkg-parsechangelog.1 dpkg-shlibdeps.1
+
+GENFILES		= $(CHANGELOG_PARSERS) $(BIN_SCRIPTS) $(SBIN_SCRIPTS) $(GEN_MAN8PAGES)
+
+.PHONY: all
+all:: $(GENFILES)
+
+.PHONY: install
+install:: all install-program install-doc
+
+.PHONY: clean
+clean::
+	$(RM) $(GENFILES)
+
+.PHONY: cvsclean
+cvslean:: clean
+	$(RM) Makefile
+
+.PHONY: install-program
+install-program:
+	$(mkinstalldirs) $(DESTDIR)/$(bindir)
+	set -e ; for i in $(BIN_SCRIPTS) ; do \
+		if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+		$(INSTALL_SCRIPT) $$d$$i $(DESTDIR)/$(bindir) ; \
+	done
+	$(mkinstalldirs) $(DESTDIR)/$(sbindir)
+	set -e ; for i in $(SBIN_SCRIPTS) ; do \
+		if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+		$(INSTALL_SCRIPT) $$d$$i $(DESTDIR)/$(sbindir) ; \
+	done
+	$(mkinstalldirs) $(DESTDIR)/$(alternativesdir)
+	$(INSTALL_DATA) $(srcdir)/README.alternatives \
+		$(DESTDIR)/$(alternativesdir)/README
+	$(mkinstalldirs) $(DESTDIR)/$(parsechangelogdir)
+	set -e ; for i in $(CHANGELOG_PARSERS) ; do \
+		if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+		rn=`echo $$i | sed -e 's/^cl-//'` ; \
+		$(INSTALL_SCRIPT) $$d$$i $(DESTDIR)/$(parsechangelogdir)/$$rn ; \
+	done
+	$(mkinstalldirs) $(DESTDIR)/$(dpkglibdir)
+	set -e ; for i in $(SCRIPTLIBS) ; do \
+		if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+		$(INSTALL_DATA) $$d$$i $(DESTDIR)/$(dpkglibdir) ; \
+	done
+	$(mkinstalldirs) $(DESTDIR)/$(elispdir)
+	set -e ; for i in $(LISPFILES) ; do \
+		if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+		$(INSTALL_DATA) $$d$$i $(DESTDIR)/$(elispdir) ; \
+	done
+
+.PHONY: install-doc
+install-doc:
+	$(mkinstalldirs) $(DESTDIR)/$(man1dir)
+	set -e ; for i in $(MAN1PAGES) ; do \
+		if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+		$(INSTALL_DATA) $$d$$i $(DESTDIR)/$(man1dir) ; \
+	done
+	set -e ; for i in $(MAN_SOURCE_ALIASES) ; do \
+		echo ".so dpkg-source.1" > $(DESTDIR)$(man1dir)/$$i ; \
+		chmod 644 $(DESTDIR)$(man1dir)/$$i ; \
+	done
+	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
+	set -e ; for i in $(MAN8PAGES) $(GEN_MAN8PAGES) ; do \
+		if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+		$(INSTALL_DATA) $$d$$i $(DESTDIR)/$(man8dir) ; \
+	done
+
+
+%.8: %.pl
+	pod2man --section=8 $^ > $@
+
+%: %.pl
+	$(SED) -e "s:^#![:space:]*/usr/bin/perl:#! $(perlpath):; \
+		s:\$$dpkglibdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$dpkglibdir=\"$(dpkglibdir)\":; \
+		s:\$$version[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:\$$version=\"$(VERSION)\":" \
+		< $< > $@
+
+%: %.sh 
+	$(SED) -e "s:version=\"[^\"]*\":version=\"$(VERSION)\":" \
+		< $< > $@

split/Makefile.am

@@ -1,50 +0,0 @@
-## Process this file with automake to produce a Makefile.in
-
-AUTOMAKE_OPTIONS	= 1.1 foreign
-
-## Directory definitions
-
-pkglibdir		= $(libdir)/@PACKAGE@
-localedir		= $(datadir)/locale
-
-## Various options
-
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
-LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
-
-CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS		= @CXXFLAGS @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-
-DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
-			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@ \
-			  -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\"
-
-## Automake variables
-
-bin_PROGRAMS		= dpkg-split
-pkglib_SCRIPTS		= mksplit
-man_MANS		= dpkg-split.8
-
-EXTRA_DIST		= mksplit.pl dpkg-split.8
-
-dpkg_split_SOURCES	= main.c split.c info.c queue.c join.c dpkg-split.h
-dpkg_split_LDADD	= ../lib/libdpkg.la ../lib/myopt.o
-
-
-CLEANFILES		= $(pkglib_SCRIPTS)
-MAINTAINERCLEANFILES	= $(srcdir)/Makefile.in
-
-## Rules
-
-SUFFIXES		= .pl
-
-.pl:
-	sed -e "s:^#![:space:]*/usr/bin/perl:#! $(perlpath):;" \
-		< $< > $@.new
-	chmod 755 $@.new
-	mv $@.new $@
-
-## End of file.

split/Makefile.in

@@ -0,0 +1,46 @@
+
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+top_srcdir	= @top_srcdir@
+
+include ../Makefile.conf
+
+SPLIT_SOURCES		= queue.c split.c info.c join.c main.c
+SPLIT_OBJECTS		= $(patsubst %.c, %.o, $(SPLIT_SOURCES))
+
+GENFILES		= $(SPLIT_OBJECTS) dpkg-split
+
+.PHONY: all
+all:: dpkg-split
+
+.PHONY: install
+install:: all
+
+.PHONY: clean
+clean::
+	$(RM) $(GENFILES)
+
+.PHONY: cvsclean
+cvslean:: clean
+	$(RM) Makefile
+
+.PHONY: install
+install:: install-program install-doc
+
+.PHONY: install-program
+install-program:
+	$(mkinstalldirs) $(DESTDIR)/$(bindir)
+	$(INSTALL) dpkg-split $(DESTDIR)$(bindir)
+	$(mkinstalldirs) $(DESTDIR)/$(dpkglibdir)
+	$(INSTALL) $(srcdir)/mksplit.pl $(DESTDIR)/$(dpkglibdir)/mksplit
+
+.PHONY: install-doc
+install-doc:
+	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
+	$(INSTALL_DATA) $(srcdir)/dpkg-split.8 $(DESTDIR)/$(man8dir)
+
+dpkg-split: $(SPLIT_OBJECTS) 
+	$(CC) $(LDFLAGS) -L../lib -o $@ $(SPLIT_OBJECTS) $(LIBS) $(NLS_LIBS) -ldpkg
+
+split.o: split.c
+	$(CC) $(ALL_CFLAGS) -DMKSPLITSCRIPT=\"$(dpkglibdir)/mksplit\" -c $<

utils/.cvsignore

@@ -2,4 +2,5 @@ Makefile.in
 configure
 aclocal.m4
 Makefile.in
-stamp-h.in
+config.h
+config.h.in

utils/Makefile.am

@@ -1,31 +0,0 @@
-## Process this file with automake to produce a Makefile.in
-
-AUTOMAKE_OPTIONS		= 1.1 foreign
-
-## Directory definitions
-
-pkglibdir		= $(libdir)/@PACKAGE@
-localedir		= $(datadir)/locale
-
-## Various options
-
-CFLAGS			= @CFLAGS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
-LIBS			= @LIBS@ $(XLIBS)
-
-CXXFLAGS		= @CXXFLAGS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS		= @CXXFLAGS @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-
-DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
-			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@ \
-			  -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\"
-## Automake variables
-
-sbin_PROGRAMS			= start-stop-daemon
-start_stop_daemon_SOURCES	= start-stop-daemon.c
-
-man_MANS			= start-stop-daemon.8
-
-## End of file.

utils/Makefile.in

@@ -0,0 +1,52 @@
+
+VPATH		= @srcdir@
+srcdir		= @srcdir@
+top_srcdir	= @top_srcdir@/..
+
+include ../Makefile.conf
+
+SSD_SOURCES		= start-stop-daemon.c
+SSD_OBJECTS		= $(patsubst %.c, %.o, $(SSD_SOURCES))
+SSD_MANPAGES		= start-stop-daemon.8
+
+MD5_SOURCES		= md5sum.c md5.c
+MD5_OBJECTS		= $(patsubst %.c, %.o, $(MD5_SOURCES))
+MD5_MANPAGES		= md5sum.1
+
+GENFILES		= $(SSD_OBJECTS) start-stop-daemon
+
+.PHONY: all
+all:: start-stop-daemon md5sum
+
+.PHONY: install
+install:: all
+
+.PHONY: clean
+clean::
+	$(RM) $(GENFILES)
+
+.PHONY: cvsclean
+cvslean:: clean
+	$(RM) Makefile confdefs.h config.log
+
+.PHONY: install
+install:: install-program install-doc
+
+.PHONY: install-program
+install-program:
+	$(mkinstalldirs) $(DESTDIR)/$(sbindir)
+	$(INSTALL) start-stop-daemon $(DESTDIR)/$(sbindir)
+	$(mkinstalldirs) $(DESTDIR)/$(bindir)
+	$(INSTALL) md5sum $(DESTDIR)/$(bindir)
+
+.PHONY: install-doc
+install-doc:
+	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
+	$(INSTALL_DATA) $(srcdir)/$(SSD_MANPAGES) $(DESTDIR)/$(man8dir)
+	$(mkinstalldirs) $(DESTDIR)/$(man1dir)
+	$(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir)
+
+start-stop-daemon: $(SSD_OBJECTS)
+
+md5sum: $(MD5_OBJECTS)
+

version-nr

@@ -0,0 +1 @@
+1.6