Installing helpers to /usr/share/live-helper/helpers instead of /usr/bin.

This commit is contained in:
Daniel Baumann 2009-11-15 21:52:23 +01:00
parent 5107fd236f
commit fbad988b41
2 changed files with 12 additions and 12 deletions

View File

@ -25,13 +25,13 @@ build:
@echo "Nothing to build."
install:
# Installing executables
mkdir -p $(DESTDIR)/usr/bin
cp helpers/* $(DESTDIR)/usr/bin
# Installing shared data
mkdir -p $(DESTDIR)/usr/share/live-helper
cp -r data examples live-helper.sh functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
cp -r data examples live-helper.sh functions helpers hooks includes lists templates $(DESTDIR)/usr/share/live-helper
# Installing executables
mkdir -p $(DESTDIR)/usr/bin
mv $(DESTDIR)/usr/share/live-helper/helpers/lh $(DESTDIR)/usr/share/live-helper/helpers/live-helper $(DESTDIR)/usr/bin
# Installing documentation
mkdir -p $(DESTDIR)/usr/share/doc/live-helper
@ -64,15 +64,12 @@ install:
mkdir -p $(DESTDIR)/var/log
uninstall:
# Uninstalling executables
for HELPER in helpers/*; \
do \
rm -f $(DESTDIR)/usr/bin/$$(basename $$HELPER); \
done
# Uninstalling shared data
rm -rf $(DESTDIR)/usr/share/live-helper
# Uninstalling executables
rm -f $(DESTDIR)/usr/bin/lh $(DESTDIR)/usr/bin/live-helper
# Uninstalling documentation
rm -rf $(DESTDIR)/usr/share/doc/live-helper

View File

@ -34,7 +34,10 @@ case "${1}" in
COMMAND="${1}"
shift
if [ -x "$(which lh_${COMMAND} 2>/dev/null)" ]
if [ -x /usr/share/live-helper/helpers/lh_${COMMAND} ]
then
LH=1 exec /usr/share/live-helper/helpers/lh_"${COMMAND}" "${@}"
elif [ -x "$(which lh_${COMMAND} 2>/dev/null)" ]
then
LH=1 exec lh_"${COMMAND}" "${@}"
else