Use the right installation directories.
This commit is contained in:
parent
d42c0d4293
commit
4d8f09ee68
|
@ -80,10 +80,10 @@ if (UNIX AND NOT MINGW)
|
|||
endif()
|
||||
install(PROGRAMS
|
||||
${CMAKE_CURRENT_BINARY_DIR}/ybcon
|
||||
DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/ybcon.d)
|
||||
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts/completions DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/ybcon.d)
|
||||
DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
|
||||
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts/completions DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ybcon.d)
|
||||
install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/ybcon
|
||||
DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
DESTINATION yerbacon/${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
elseif(MINGW OR MSVC)
|
||||
set(CMAKE_EXE_LINKER_FLAGS "-static -static-libstdc++ ${CMAKE_EXE_LINKER_FLAGS}")
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
# Post install ybcon script
|
||||
|
||||
ybconDir="/opt/etc/ybcon.d"
|
||||
ln -sf "/opt/yerbacon/bin/ybcon" "/usr/bin/ybcon"
|
||||
fishLoc="/usr/share/fish/vendor_completions.d"
|
||||
bashcompleteLoc="/etc/bash_completion.d"
|
||||
zshLoc="/etc/zsh_completion.d"
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
EXENAME=ybcon
|
||||
|
||||
# Default location of the executable
|
||||
defaultBinLocation=/opt/etc/ybcon.d/ybcon
|
||||
defaultBinLocation=/opt/libexec/ybcon
|
||||
|
||||
usage() {
|
||||
if [ "$1" = false ]; then echo "Invalid arguments, usage:"; fi
|
||||
|
|
|
@ -54,7 +54,8 @@ vector<tok>& lex(const string& in)
|
|||
case tok::STRING: {
|
||||
generated.first = type;
|
||||
longLex = true;
|
||||
}; break;
|
||||
break;
|
||||
}
|
||||
default: resVal.emplace_back(type, string(1, current));
|
||||
}
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue