From 80d36ef3cd5a7f4ffd620653824a4b22f5a93073 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 8 Nov 2011 16:23:23 -0600 Subject: [PATCH] * configure.ac, debian/install, etc/byobu/Makefile.am, etc/profile.d/Makefile.am: - fix installations to /etc --- configure.ac | 1 + debian/changelog | 3 +++ debian/install | 1 - etc/byobu/Makefile.am | 2 +- etc/profile.d/Makefile.am | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a926cbcb..d2d7e26d 100644 --- a/configure.ac +++ b/configure.ac @@ -18,6 +18,7 @@ AC_PROG_LN_S AC_OUTPUT(Makefile \ etc/byobu/Makefile \ + etc/profile.d/Makefile \ usr/share/applications/Makefile \ usr/share/byobu/ec2/Makefile \ usr/share/byobu/keybindings/Makefile \ diff --git a/debian/changelog b/debian/changelog index 288f2274..a81f3461 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ byobu (4.46) unreleased; urgency=low - Enable any user to remotely opt into launching byobu by default, using an LC_BYOBU=1 environment variable, which is transmitted over SSH + * configure.ac, debian/install, etc/byobu/Makefile.am, + etc/profile.d/Makefile.am: + - fix installations to /etc -- Dustin Kirkland Mon, 31 Oct 2011 09:46:46 -0400 diff --git a/debian/install b/debian/install index 10a59b85..b5cae0c8 100644 --- a/debian/install +++ b/debian/install @@ -1,4 +1,3 @@ /usr -../../etc/byobu/socketdir etc/byobu/ ../../debian/source_byobu.py usr/share/apport/package-hooks ../../debian/lintian/byobu usr/share/lintian/overrides diff --git a/etc/byobu/Makefile.am b/etc/byobu/Makefile.am index c71909e0..5ff1a4c5 100644 --- a/etc/byobu/Makefile.am +++ b/etc/byobu/Makefile.am @@ -1,2 +1,2 @@ -etcdir = $(datadir)/@PACKAGE@/ +etcdir = $(sysconfdir)/@PACKAGE@/ etc_DATA = backend socketdir diff --git a/etc/profile.d/Makefile.am b/etc/profile.d/Makefile.am index 6d281a2a..e1189d78 100644 --- a/etc/profile.d/Makefile.am +++ b/etc/profile.d/Makefile.am @@ -1,2 +1,2 @@ -etcdir = $(datadir)/@PACKAGE@/profile.d +etcdir = $(sysconfdir)/profile.d etc_DATA = Z97-byobu.sh