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
41
42
43
44
45
46
47
48
|
Description: Fix install path for files and build flags for hardening.
Add destdir, create bin directory and move man-page to it's
correct path. Ensure CFLAGS, CPPFLAGS and LDFLAGS from debhelper/hardening
is included during build.
Author: Håvard Flaget Aasen <haavard_aasen@yahoo.no>
Author: Petter Reinholdtsen
Forwarded: not-needed
Last-Update: 2024-06-16
---
Index: osdclock-salsa/Makefile
===================================================================
--- osdclock-salsa.orig/Makefile 2024-06-16 13:02:55.460096125 +0200
+++ osdclock-salsa/Makefile 2024-06-16 13:03:54.980477219 +0200
@@ -6,17 +6,17 @@
EXEC_PREFIX=$(PREFIX)
BINDIR=$(EXEC_PREFIX)/bin
LIBDIR=$(EXEC_PREFIX)/lib
-MANDIR=$(PREFIX)/man
+MANDIR=$(PREFIX)/share/man
INCLUDEDIR=$(PREFIX)/include
CC=gcc
INSTALL=/usr/bin/install -c
INSTALL_DATA=$(INSTALL) -m 644
-CFLAGS=-O2 -Wall -pipe -I. -DXOSD_VERSION=\"$(VERSION)\" -I/usr/X11R6/include
-LDFLAGS=-L. -L/usr/X11R6/lib -lX11 -lXext -lpthread -lXt
+CFLAGS+=-pipe -I. -DXOSD_VERSION=\"$(VERSION)\" -I/usr/X11R6/include
+LDFLAGS+=-L. -L/usr/X11R6/lib -lX11 -lXext -lpthread -lXt
-XOSDLIBS=-lxosd
+XOSDLIBS=-lxosd -lXinerama
SOURCES=NEWS AUTHORS ChangeLog README COPYING Makefile \
osd_clock.c osd_clock.1
@@ -37,9 +37,9 @@
tar: xosd-$(VERSION).tar.gz
install: all
- $(INSTALL) osd_clock $(BINDIR)
- mkdir -p $(MANDIR)/man1 $(MANDIR)/man3
- $(INSTALL_DATA) osd_clock.1 $(MANDIR)/man1/
+ mkdir -p $(DESTDIR)/$(MANDIR)/man1 $(DESTDIR)/$(BINDIR)
+ $(INSTALL) osd_clock $(DESTDIR)/$(BINDIR)
+ $(INSTALL_DATA) osd_clock.1 $(DESTDIR)/$(MANDIR)/man1/
clean:
rm -f *~ *.o *.o.pic osd_clock
|
