From e06b402d900b2c778212f1818d47dcfda1d2948b Mon Sep 17 00:00:00 2001
From: Live session user <ubuntu@ubuntu>
Date: Wed, 28 Jul 2010 15:47:03 +0000
Subject: [PATCH] rest of fixes to get non-distro install working!

---
 Makefile.am                             |  4 +++-
 configure.ac                            |  2 ++
 etc/byobu/Makefile.am                   |  2 ++
 usr/bin/byobu-janitor                   | 11 ++++++++++-
 usr/share/byobu/keybindings/Makefile.am |  2 ++
 5 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 etc/byobu/Makefile.am
 create mode 100644 usr/share/byobu/keybindings/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9d3020af..684bc285 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
-SUBDIRS = usr/share/applications \
+SUBDIRS = etc/byobu \
+	usr/share/applications \
 	usr/share/byobu/ec2 \
+	usr/share/byobu/keybindings \
 	usr/share/byobu/pixmaps \
 	usr/share/byobu/profiles \
 	usr/share/byobu/tests \
diff --git a/configure.ac b/configure.ac
index 228e42fa..0a5f9baa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,10 @@ AM_INIT_AUTOMAKE(byobu, 2.83)
 # Checks for library functions.
 
 AC_OUTPUT(Makefile \
+	etc/byobu/Makefile \
 	usr/share/applications/Makefile \
 	usr/share/byobu/ec2/Makefile \
+	usr/share/byobu/keybindings/Makefile \
 	usr/share/byobu/pixmaps/Makefile \
 	usr/share/byobu/profiles/Makefile \
 	usr/share/byobu/tests/Makefile \
diff --git a/etc/byobu/Makefile.am b/etc/byobu/Makefile.am
new file mode 100644
index 00000000..5cf87afb
--- /dev/null
+++ b/etc/byobu/Makefile.am
@@ -0,0 +1,2 @@
+etcdir = $(datadir)/@PACKAGE@/profiles
+etc_DATA = statusrc socketdir
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index 3423a8ef..636e747c 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -94,7 +94,16 @@ if [ -h "$PROFILE" ]; then
 fi
 
 [ -s "$HOME/.$PKG/keybindings" ] || echo "source $BYOBU_PREFIX/share/$PKG/keybindings/common" > "$HOME/.$PKG/keybindings"
-[ -r "$HOME/.$PKG/status" ] || $(grep -A 999999 BEGIN_CUT_HERE /etc/$PKG/statusrc | grep -B 999999 END_CUT_HERE | grep -v CUT > "$HOME/.$PKG/status")
+if [ ! -r "$HOME/.$PKG/status" ]; then
+	if [ -r /etc/$PKG/statusrc ]; then
+		skel=/etc/$PKG/statusrc
+	elif [ -r "$BYOBU_PREFIX/share/$PKG/profiles/statusrc" ]; then
+		skel="$BYOBU_PREFIX/share/$PKG/profiles/statusrc"
+	else
+		skel=/dev/null
+	fi
+	grep -A 999999 BEGIN_CUT_HERE $skel | grep -B 999999 END_CUT_HERE | grep -v CUT > "$HOME/.$PKG/status"
+fi
 [ -r "$HOME/.$PKG/windows" ] || touch "$HOME/.$PKG/windows"
 [ -r "$HOME/.screenrc" ] || touch "$HOME/.screenrc"
 
diff --git a/usr/share/byobu/keybindings/Makefile.am b/usr/share/byobu/keybindings/Makefile.am
new file mode 100644
index 00000000..26f9c992
--- /dev/null
+++ b/usr/share/byobu/keybindings/Makefile.am
@@ -0,0 +1,2 @@
+keybindingsdir = $(datadir)/@PACKAGE@/keybindings
+keybindings_DATA = common f-keys none screen-escape-keys