rest of fixes to get non-distro install working!

This commit is contained in:
Live session user 2010-07-28 15:47:03 +00:00
commit e06b402d90
5 changed files with 19 additions and 2 deletions

View file

@ -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 \

View file

@ -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 \

2
etc/byobu/Makefile.am Normal file
View file

@ -0,0 +1,2 @@
etcdir = $(datadir)/@PACKAGE@/profiles
etc_DATA = statusrc socketdir

View file

@ -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"

View file

@ -0,0 +1,2 @@
keybindingsdir = $(datadir)/@PACKAGE@/keybindings
keybindings_DATA = common f-keys none screen-escape-keys