blob: 2602bb91187a4523df8c0b953a98146e5836e4c0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
--- a/Makefile
+++ b/Makefile
@@ -11,16 +11,16 @@
all: $(TARGET) $(APM_CHECK)
$(TARGET): obj/xbattbar.o
- gcc -o $@ $< -lX11 $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(shell $(PKG_CONFIG) --libs x11)
obj/xbattbar.o: xbattbar.c obj/stamp
- gcc -MMD -o $@ -c $< $(CFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -MMD -o $@ -c $<
$(APM_CHECK): obj/xbattbar-check-apm.o
- gcc -o $@ $< $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp
- gcc -MMD -D$(OS_TYPE) -o $@ -c $< $(CFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $<
obj/stamp:
mkdir obj
@@ -32,12 +32,12 @@
install: $(TARGET) $(APM_CHECK)
- install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT)
+ install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)
install -d -m 0755 $(DESTDIR)/usr/bin
install -d -m 0755 $(DESTDIR)/usr/share/man/man1
- install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/
- install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/
- install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/lib/$(PROJECT)/
+ install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
+ install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
+ install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/
install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1
|
GitWeb
