Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 21:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

use variables as xsel target

Browse source
This commit is contained in:
Grissiom 2010-09-18 13:27:34 +08:00
parent 7f7b30959b
commit d35d65cc40
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Makefile.in
View file

@ -245,7 +245,7 @@ FUNCTIONS_DIR_FILES := $(wildcard share/functions/*.fish)
# #
SIMPLE_PROGRAMS := fish set_color mimedb fish_pager fishd fish_indent SIMPLE_PROGRAMS := fish set_color mimedb fish_pager fishd fish_indent
PROGRAMS := $(SIMPLE_PROGRAMS) @XSEL@ @SEQ_FALLBACK@ PROGRAMS := $(SIMPLE_PROGRAMS) @XSEL_BIN@ @SEQ_FALLBACK@
# #
@ -264,6 +264,13 @@ TRANSLATIONS_SRC := $(wildcard po/*.po)
TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo) TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)
#
# Extra util
#
XSEL := @XSEL@
XSEL_BIN := @XSEL_BIN@
# #
# Make everything needed for installing fish # Make everything needed for installing fish
# #
@ -342,14 +349,14 @@ test: $(PROGRAMS) fish_tests
# Build the xsel program, which is maintained in its own tarball # Build the xsel program, which is maintained in its own tarball
# #
xsel-1.2.0: ${XSEL}:
tar -xf xsel-1.2.0.tar.gz tar -xf ${XSEL}.tar.gz
xsel-1.2.0/Makefile: xsel-1.2.0 ${XSEL}/Makefile: ${XSEL}
cd xsel-1.2.0 && ./configure cd ${XSEL} && ./configure
xsel-1.2.0/xsel: xsel-1.2.0/Makefile ${XSEL_BIN}: ${XSEL}/Makefile
$(MAKE) -C xsel-1.2.0 || echo "Failed to build xsel - either add the required dependencies or use './configure --without-xsel' to disable it." $(MAKE) -C ${XSEL} || echo "Failed to build xsel - either add the required dependencies or use './configure --without-xsel' to disable it."
# #

5
configure.ac
View file

@ -206,9 +206,10 @@ AC_ARG_WITH(
) )
if [[ "$xsel" = "with_xsel" ]]; then if [[ "$xsel" = "with_xsel" ]]; then
XSEL=xsel-1.2.0/xsel XSEL=xsel-1.2.0
XSEL_BIN=$XSEL/xsel
XSEL_MAN=xsel.1x XSEL_MAN=xsel.1x
XSEL_MAN_PATH=xsel-1.2.0/xsel.1x XSEL_MAN_PATH=$XSEL/xsel.1x
fi fi