From 60e8a0dd4007dbd069bfc09f7c1afcd1427f9ca7 Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Tue, 5 Oct 1999 21:55:25 +0000 Subject: [PATCH] Fix installation-problems --- ChangeLog | 7 +++++-- debian/changelog | 3 ++- debian/rules | 10 +++++----- doc/Makefile.am | 2 +- po/Makefile.in.in | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8bafffc..4be74bd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ +Tue Oct 5 19:16:38 CEST 1999 Wichert Akkerman + + * Set docdir to $(datadir)/doc + * Install /etc/emacs/site-start.d/50dpkg-dev.el with mode 644 + Tue Oct 5 04:08:41 CEST 1999 Wichert Akkerman - * Change datadir to just $(prefix) in po/Makefile.in.in, otherwise - localedir would become /usr/share/share/locale * Make /usr/share/doc/dpkg-dev a symlink to /usr/share/doc/dpkg Mon Oct 4 15:38:42 CEST 1999 Wichert Akkerman diff --git a/debian/changelog b/debian/changelog index ce2f1242..382153b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ dpkg (1.4.1.14) unstable; urgency=low * dpkg-source works again on empty diffs, Closes: Bug# 46159 * Install locale-files in /usr/share, Closes: Bug# 46631 * Make /usr/share/doc/dpkg-dev a symlink to /usr/share/doc/dpkg + * Actually include fix to make update-alternatives works filesystems (oops!) - -- Wichert Akkerman UNRELEASED + -- Wichert Akkerman Tue, 5 Oct 1999 19:19:05 +0200 dpkg (1.4.1.13) unstable; urgency=low diff --git a/debian/rules b/debian/rules index eedbef78..ea301855 100755 --- a/debian/rules +++ b/debian/rules @@ -28,10 +28,10 @@ $(BUILD)/config.status: install -d debian/build cd $(BUILD) && ../../configure \ --enable-shared \ - --prefix=/usr/share \ - --exec-prefix=/usr \ + --prefix=/usr \ --datadir=/usr/share \ --mandir=/usr/share/man \ + --infodir=/usr/share/info \ --sysconfdir=/etc \ --sharedstatedir=/var/lib \ --localstatedir=/var/lib @@ -72,18 +72,18 @@ binary-trees: build cp debian/{prerm,postinst} $(mcidir)/. $(MAKE) -C $(BUILD) top_distdir=. dist $(MAKE) -C $(BUILD) \ - prefix=$(DIR)/debian/tmp-main/usr/share \ - exec_prefix=$(DIR)/debian/tmp-main/usr \ + prefix=$(DIR)/debian/tmp-main/usr \ sysconfdir=$(DIR)/debian/tmp-main/etc \ datadir=$(DIR)/debian/tmp-main/usr/share \ mandir=$(DIR)/debian/tmp-main/usr/share/man \ + infodir=$(DIR)/debian/tmp-main/usr/share/info \ sharedstatedir=$(DIR)/debian/tmp-main/var/lib \ localstatedir=$(DIR)/debian/tmp-main/var/lib \ install 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 -c debian/50dpkg-dev.el debian/tmp-dev/etc/emacs/site-start.d/. + install -m 644 debian/50dpkg-dev.el debian/tmp-dev/etc/emacs/site-start.d/. 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 diff --git a/doc/Makefile.am b/doc/Makefile.am index 58d1d0c8..18097f9d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.1 foreign ## Directory definitions -docdir = $(prefix)/doc +docdir = $(datadir)/doc pkgdocdir = $(docdir)/@PACKAGE@ ## Subdirectories with translations diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 6465d0fe..111b40fc 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -18,7 +18,7 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ -datadir = $(prefix) +datadir = $(prefix)/@DATADIRNAME@ localedir = $(datadir)/locale gnulocaledir = $(prefix)/share/locale gettextsrcdir = $(prefix)/share/gettext/po -- 2.39.5