Changeset View
Changeset View
Standalone View
Standalone View
x11/ly/files/patch-makefile
| --- makefile.orig 2019-09-21 16:00:16 UTC | --- makefile.orig 2020-02-03 07:51:05 UTC | ||||
| +++ makefile | +++ makefile | ||||
| @@ -1,9 +1,9 @@ | @@ -1,9 +1,9 @@ | ||||
| NAME = ly | NAME = ly | ||||
| CC = gcc | CC = gcc | ||||
| FLAGS = -std=c99 -pedantic -g | FLAGS = -std=c99 -pedantic -g | ||||
| -FLAGS+= -Wall -Wno-unused-parameter -Wextra -Werror=vla -Werror | -FLAGS+= -Wall -Wextra -Werror=vla -Wno-unused-parameter | ||||
| +FLAGS+= -Wall -Wno-unused-parameter -Wextra -Werror=vla | +FLAGS+= -Wall -Wextra -Wno-unused-parameter | ||||
| #FLAGS+= -DDEBUG | #FLAGS+= -DDEBUG | ||||
| -FLAGS+= -DGIT_VERSION_STRING=\"$(shell git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')\" | -FLAGS+= -DGIT_VERSION_STRING=\"$(shell git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')\" | ||||
| +FLAGS+= -DGIT_VERSION_STRING=\"${DISTVERSIONFULL}\" | +FLAGS+= -DGIT_VERSION_STRING=\"${DISTVERSIONFULL}\" | ||||
| LINK = -lpam -lxcb | LINK = -lpam -lxcb | ||||
| VALGRIND = --show-leak-kinds=all --track-origins=yes --leak-check=full --suppressions=../res/valgrind.supp | VALGRIND = --show-leak-kinds=all --track-origins=yes --leak-check=full --suppressions=../res/valgrind.supp | ||||
| CMD = ./$(NAME) | CMD = ./$(NAME) | ||||
| @@ -12,6 +12,10 @@ OS:= $(shell uname -s) | @@ -12,6 +12,10 @@ OS:= $(shell uname -s) | ||||
| ifeq ($(OS), Linux) | ifeq ($(OS), Linux) | ||||
| FLAGS+= -D_DEFAULT_SOURCE | FLAGS+= -D_DEFAULT_SOURCE | ||||
| endif | endif | ||||
| +ifeq ($(OS), FreeBSD) | +ifeq ($(OS), FreeBSD) | ||||
| + FLAGS+= -D_DEFAULT_SOURCE ${CPPFLAGS} ${CFLAGS} | + FLAGS+= -D_DEFAULT_SOURCE ${CPPFLAGS} ${CFLAGS} | ||||
| + LINK+= ${LIBS} | + LINK+= ${LIBS} | ||||
| +endif | +endif | ||||
| BIND = bin | BIND = bin | ||||
| OBJD = obj | OBJD = obj | ||||
| @@ -68,14 +72,13 @@ leakgrind: $(BIND)/$(NAME) | @@ -71,14 +75,13 @@ leakgrind: $(BIND)/$(NAME) | ||||
| install: $(BIND)/$(NAME) | install: $(BIND)/$(NAME) | ||||
| @echo "installing" | @echo "installing" | ||||
| - @install -dZ ${DESTDIR}/etc/ly | - @install -dZ ${DESTDIR}/etc/ly | ||||
| - @install -DZ $(BIND)/$(NAME) -t ${DESTDIR}/usr/bin | - @install -DZ $(BIND)/$(NAME) -t ${DESTDIR}/usr/bin | ||||
| - @install -DZ $(RESD)/xsetup.sh -t ${DESTDIR}/etc/ly | |||||
| - @install -DZ $(RESD)/wsetup.sh -t ${DESTDIR}/etc/ly | |||||
| - @install -DZ $(RESD)/config.ini -t ${DESTDIR}/etc/ly | - @install -DZ $(RESD)/config.ini -t ${DESTDIR}/etc/ly | ||||
| - @install -dZ ${DESTDIR}/etc/ly/lang | - @install -DZ $(RESD)/xsetup.sh -t $(DATADIR) | ||||
| - @install -DZ $(RESD)/lang/* -t ${DESTDIR}/etc/ly/lang | - @install -DZ $(RESD)/wsetup.sh -t $(DATADIR) | ||||
| - @install -dZ $(DATADIR)/lang | |||||
| - @install -DZ $(RESD)/lang/* -t $(DATADIR)/lang | |||||
| - @install -DZ $(RESD)/ly.service -t ${DESTDIR}/usr/lib/systemd/system | - @install -DZ $(RESD)/ly.service -t ${DESTDIR}/usr/lib/systemd/system | ||||
| + @install -dZ ${DESTDIR}${PREFIX}/etc/ly | + @install -dZ ${DESTDIR}${PREFIX}/etc/ly | ||||
| + @install -DZ $(BIND)/$(NAME) -t ${DESTDIR}${PREFIX}/bin | + @install -DZ $(BIND)/$(NAME) -t ${DESTDIR}${PREFIX}/bin | ||||
| + @install -DZ $(RESD)/config.ini -t ${DESTDIR}${PREFIX}/etc/ly | |||||
| + @install -DZ $(RESD)/xsetup.sh -t ${DESTDIR}${PREFIX}/etc/ly | + @install -DZ $(RESD)/xsetup.sh -t ${DESTDIR}${PREFIX}/etc/ly | ||||
| + @install -DZ $(RESD)/wsetup.sh -t ${DESTDIR}${PREFIX}/etc/ly | + @install -DZ $(RESD)/wsetup.sh -t ${DESTDIR}${PREFIX}/etc/ly | ||||
| + @install -DZ $(RESD)/config.ini -t ${DESTDIR}${PREFIX}/etc/ly | |||||
| + @install -dZ ${DESTDIR}${PREFIX}/etc/ly/lang | + @install -dZ ${DESTDIR}${PREFIX}/etc/ly/lang | ||||
| + @install -DZ $(RESD)/lang/* -t ${DESTDIR}${PREFIX}/etc/ly/lang | + @install -DZ $(RESD)/lang/* -t ${DESTDIR}${PREFIX}/etc/ly/lang | ||||
| uninstall: | installnoconf: $(BIND)/$(NAME) | ||||
| @echo "uninstalling" | @echo "installing without the configuration file" | ||||