--- Makefile +++ Makefile @@ -30,7 +30,7 @@ $(REGEX_SRC) OBJ = $(SRC:%.c=obj/%.o) -ELF = vis vis-menu vis-digraph +ELF = @VISEXEC@ vis-menu vis-digraph EXECUTABLES = $(ELF) vis-clipboard vis-complete vis-open MANUALS = $(EXECUTABLES:=.1) @@ -57,7 +57,7 @@ $(CFLAGS_SELINUX) $(CFLAGS_TRE) $(CFLAGS_LUA) $(CFLAGS_LPEG) $(CFLAGS_STD) \ $(CFLAGS_LIBC) -CFLAGS_VIS += -DVIS_PATH=\"${SHAREPREFIX}/vis\" +CFLAGS_VIS += -DVIS_PATH=\"${SHAREPREFIX}/@VISDIR@\" CFLAGS_VIS += -DCONFIG_HELP=${CONFIG_HELP} CFLAGS_VIS += -DCONFIG_CURSES=${CONFIG_CURSES} CFLAGS_VIS += -DCONFIG_LUA=${CONFIG_LUA} @@ -92,7 +92,7 @@ -include obj/*.d -vis: ${OBJ} +@VISEXEC@: ${OBJ} ${CC} -o $@ ${OBJ} ${LDFLAGS} ${LDFLAGS_VIS} ${LDFLAGS_EXTRA} vis-menu: vis-menu.c @@ -195,10 +195,10 @@ chmod 755 ${DESTDIR}${PREFIX}/bin/"$$e"; \ done @test ${CONFIG_LUA} -eq 0 || { \ - echo installing support files to ${DESTDIR}${SHAREPREFIX}/vis; \ - mkdir -p ${DESTDIR}${SHAREPREFIX}/vis; \ - cp -r lua/* ${DESTDIR}${SHAREPREFIX}/vis; \ - rm -rf "${DESTDIR}${SHAREPREFIX}/vis/doc"; \ + echo installing support files to ${DESTDIR}${SHAREPREFIX}/@VISDIR@; \ + mkdir -p ${DESTDIR}${SHAREPREFIX}/@VISDIR@; \ + cp -r lua/* ${DESTDIR}${SHAREPREFIX}/@VISDIR@; \ + rm -rf "${DESTDIR}${SHAREPREFIX}/@VISDIR@/doc"; \ } @echo installing documentation to ${DESTDIR}${DOCPREFIX}/vis @mkdir -p ${DESTDIR}${DOCPREFIX}/vis @@ -232,7 +232,7 @@ @for m in ${MANUALS}; do \ rm -f ${DESTDIR}${MANPREFIX}/man1/"$$m"; \ done - @echo removing support files from ${DESTDIR}${SHAREPREFIX}/vis - @rm -rf ${DESTDIR}${SHAREPREFIX}/vis + @echo removing support files from ${DESTDIR}${SHAREPREFIX}/@VISDIR@ + @rm -rf ${DESTDIR}${SHAREPREFIX}/@VISDIR@ .PHONY: all clean testclean dist distclean install install-strip uninstall debug profile coverage test test-update luadoc luadoc-all luacheck man docker-kill docker docker-clean