|
Lines 1-13
Link Here
|
| 1 |
--- Makefile.orig 2016-03-15 16:06:25 UTC |
1 |
--- Makefile.orig 2016-10-30 12:25:26 UTC |
| 2 |
+++ Makefile |
2 |
+++ Makefile |
| 3 |
@@ -1,15 +1,16 @@ |
3 |
@@ -1,17 +1,18 @@ |
| 4 |
VERSION := $(shell git describe 2> /dev/null || cat VERSION) |
4 |
VERCMD ?= git describe 2> /dev/null |
|
|
5 |
VERSION := $(shell $(VERCMD) || cat VERSION) |
| 5 |
|
6 |
|
| 6 |
-CPPFLAGS += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\" |
7 |
-CPPFLAGS += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\" |
| 7 |
+CPPFLAGS += $(shell pkg-config --cflags xcb-ewmh xcb-event xcb-icccm xcb-randr xcb-util xcb-xinerama) -DVERSION=\"$(VERSION)\" |
8 |
+CPPFLAGS += $(shell pkg-config --cflags xcb-ewmh xcb-event xcb-icccm xcb-randr xcb-util xcb-xinerama) -DVERSION=\"$(VERSION)\" |
| 8 |
CFLAGS += -std=c99 -pedantic -Wall -Wextra |
9 |
CFLAGS += -std=c99 -pedantic -Wall -Wextra |
| 9 |
-LDLIBS = -lm -lxcb -lxcb-util -lxcb-icccm -lxcb-ewmh -lxcb-randr -lxcb-xinerama |
10 |
-LDLIBS = -lm -lxcb -lxcb-util -lxcb-keysyms -lxcb-icccm -lxcb-ewmh -lxcb-randr -lxcb-xinerama |
| 10 |
+LDLIBS = $(shell pkg-config --libs xcb-ewmh xcb-event xcb-icccm xcb-randr xcb-util xcb-xinerama) -lm |
11 |
+LDLIBS = $(shell pkg-config --libs xcb-keysyms xcb-ewmh xcb-event xcb-icccm xcb-randr xcb-util xcb-xinerama) -lm |
| 11 |
|
12 |
|
| 12 |
PREFIX ?= /usr/local |
13 |
PREFIX ?= /usr/local |
| 13 |
-BINPREFIX ?= $(PREFIX)/bin |
14 |
-BINPREFIX ?= $(PREFIX)/bin |
|
Lines 14-19
Link Here
|
| 14 |
-MANPREFIX ?= $(PREFIX)/share/man |
15 |
-MANPREFIX ?= $(PREFIX)/share/man |
| 15 |
-DOCPREFIX ?= $(PREFIX)/share/doc/bspwm |
16 |
-DOCPREFIX ?= $(PREFIX)/share/doc/bspwm |
| 16 |
-BASHCPL ?= $(PREFIX)/share/bash-completion/completions |
17 |
-BASHCPL ?= $(PREFIX)/share/bash-completion/completions |
|
|
18 |
-FISHCPL ?= $(PREFIX)/share/fish/vendor_completions.d |
| 17 |
-ZSHCPL ?= $(PREFIX)/share/zsh/site-functions |
19 |
-ZSHCPL ?= $(PREFIX)/share/zsh/site-functions |
| 18 |
+BINPREFIX = $(PREFIX)/bin |
20 |
+BINPREFIX = $(PREFIX)/bin |
| 19 |
+MANPREFIX = $(PREFIX)/man |
21 |
+MANPREFIX = $(PREFIX)/man |
|
Lines 20-30
Link Here
|
| 20 |
+DOCPREFIX = $(PREFIX)/share/doc/bspwm |
22 |
+DOCPREFIX = $(PREFIX)/share/doc/bspwm |
| 21 |
+EXPREFIX = $(PREFIX)/share/examples/bspwm |
23 |
+EXPREFIX = $(PREFIX)/share/examples/bspwm |
| 22 |
+BASHCPL = $(PREFIX)/share/bash-completion/completions |
24 |
+BASHCPL = $(PREFIX)/share/bash-completion/completions |
|
|
25 |
+FISHCPL = $(PREFIX)/share/fish/vendor_completions.d |
| 23 |
+ZSHCPL = $(PREFIX)/share/zsh/site-functions |
26 |
+ZSHCPL = $(PREFIX)/share/zsh/site-functions |
| 24 |
|
27 |
|
| 25 |
MD_DOCS = README.md doc/CHANGELOG.md doc/CONTRIBUTING.md doc/INSTALL.md doc/MISC.md doc/TODO.md |
28 |
MD_DOCS = README.md doc/CHANGELOG.md doc/CONTRIBUTING.md doc/INSTALL.md doc/MISC.md doc/TODO.md |
| 26 |
XSESSIONS ?= $(PREFIX)/share/xsessions |
29 |
XSESSIONS ?= $(PREFIX)/share/xsessions |
| 27 |
@@ -35,20 +36,36 @@ bspc: $(CLI_OBJ) |
30 |
@@ -37,22 +38,38 @@ bspc: $(CLI_OBJ) |
| 28 |
|
31 |
|
| 29 |
install: |
32 |
install: |
| 30 |
mkdir -p "$(DESTDIR)$(BINPREFIX)" |
33 |
mkdir -p "$(DESTDIR)$(BINPREFIX)" |
|
Lines 40-45
Link Here
|
| 40 |
mkdir -p "$(DESTDIR)$(BASHCPL)" |
43 |
mkdir -p "$(DESTDIR)$(BASHCPL)" |
| 41 |
- cp -p contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc |
44 |
- cp -p contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc |
| 42 |
+ ${BSD_INSTALL_DATA} contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc |
45 |
+ ${BSD_INSTALL_DATA} contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc |
|
|
46 |
mkdir -p "$(DESTDIR)$(FISHCPL)" |
| 47 |
- cp -p contrib/fish_completion "$(DESTDIR)$(FISHCPL)"/bspc.fish |
| 48 |
+ ${BSD_INSTALL_DATA} contrib/fish_completion "$(DESTDIR)$(FISHCPL)"/bspc.fish |
| 43 |
mkdir -p "$(DESTDIR)$(ZSHCPL)" |
49 |
mkdir -p "$(DESTDIR)$(ZSHCPL)" |
| 44 |
- cp -p contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc |
50 |
- cp -p contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc |
| 45 |
+ ${BSD_INSTALL_DATA} contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc |
51 |
+ ${BSD_INSTALL_DATA} contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc |