Merge branch 'master' into liblrzip

This commit is contained in:
Con Kolivas 2011-09-17 17:47:35 +10:00
commit 01d80cea58
2 changed files with 10 additions and 10 deletions

View file

@ -26,7 +26,7 @@ SUBDIRS = lzma man doc
AM_CFLAGS = -I. -I lzma/C -DNDEBUG AM_CFLAGS = -I. -I lzma/C -DNDEBUG
AM_CXXFLAGS = $(AM_CFLAGS) AM_CXXFLAGS = $(AM_CFLAGS)
lrztardir = @bindir@ lrztardir = $(bindir)
lrztar_SCRIPTS = lrztar lrztar_SCRIPTS = lrztar
noinst_LTLIBRARIES = libtmplrzip.la noinst_LTLIBRARIES = libtmplrzip.la
@ -92,19 +92,19 @@ EXTRA_DIST = \
description-pak \ description-pak \
autogen.sh \ autogen.sh \
INSTALL \ INSTALL \
lrzip.completion \ bash_completion.d/lrzip \
$(dist_doc_DATA) $(dist_doc_DATA)
install-data-hook: completiondir = $(DESTDIR)/$(sysconfdir)/bash_completion.d
test -d /etc/bash_completion.d && @INSTALL_DATA@ lrzip.completion /etc/bash_completion.d/lrzip completion_DATA = @top_srcdir@/bash_completion.d/lrzip
install-exec-hook: install-exec-hook:
$(LN_S) -f lrzip$(EXEEXT) $(DESTDIR)@bindir@/lrunzip$(EXEEXT) $(LN_S) -f lrzip$(EXEEXT) $(DESTDIR)$(bindir)/lrunzip$(EXEEXT)
$(LN_S) -f lrzip$(EXEEXT) $(DESTDIR)@bindir@/lrzcat$(EXEEXT) $(LN_S) -f lrzip$(EXEEXT) $(DESTDIR)$(bindir)/lrzcat$(EXEEXT)
$(LN_S) -f lrztar$(EXEEXT) $(DESTDIR)@bindir@/lrzuntar$(EXEEXT) $(LN_S) -f lrztar$(EXEEXT) $(DESTDIR)$(bindir)/lrzuntar$(EXEEXT)
uninstall-local: uninstall-local:
rm -f @bindir@/lrunzip rm -f $(bindir)/lrunzip
rm -f @bindir@/lrzcat rm -f $(bindir)/lrzcat
rm -f @bindir@/lrzuntar rm -f $(bindir)/lrzuntar