Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-wm/cwm/files: cwm-20110323-Makefile.patch
Date: Tue, 03 May 2011 18:06:49
Message-Id: 20110503180638.B847120057@flycatcher.gentoo.org
1 xmw 11/05/03 18:06:38
2
3 Added: cwm-20110323-Makefile.patch
4 Log:
5 Version bump
6
7 (Portage version: 2.1.9.42/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 x11-wm/cwm/files/cwm-20110323-Makefile.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/cwm/files/cwm-20110323-Makefile.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/cwm/files/cwm-20110323-Makefile.patch?rev=1.1&content-type=text/plain
14
15 Index: cwm-20110323-Makefile.patch
16 ===================================================================
17 --- cwm-20110323/Makefile.orig
18 +++ cwm-20110323/Makefile
19 @@ -15,16 +15,14 @@
20 kbfunc.o mousefunc.o font.o strlcpy.o strlcat.o y.tab.o \
21 strtonum.o fgetln.o
22
23 -X11BASE= /usr
24 +CPPFLAGS+= $(shell pkg-config --cflags-only-I xft)
25
26 -CPPFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/freetype2 -I.
27 -
28 -CFLAGS+= -Wall -O2 -g
29 +CFLAGS+=
30
31 LDADD+= -L${X11BASE}/lib -lXft -lXrender -lX11 -lxcb -lXau -lXdmcp \
32 -lfontconfig -lexpat -lfreetype -lz -lXinerama -lXrandr -lXext
33
34 -MANDIR= ${X11BASE}/man/cat
35 +MANDIR= /usr/share/man
36 MAN= cwm.1 cwmrc.5
37
38 CLEANFILES= cwm.cat1 cwmrc.cat5
39 @@ -46,9 +44,9 @@
40 $(CC) -c $(CFLAGS) $(CPPFLAGS) $<
41
42 install: ${PROG}
43 - install -m 755 cwm /usr/local/bin/
44 - install -m 644 cwm.1 /usr/local/man/man1
45 - install -m 644 cwmrc.5 /usr/local/man/man5
46 + install -D -m 755 cwm $(DESTDIR)$(BINDIR)/cwm
47 + install -D -m 644 cwm.1 $(DESTDIR)$(MANDIR)/man1/cwm.1
48 + install -D -m 644 cwmrc.5 $(DESTDIR)$(MANDIR)/man5/cwmrc.5
49
50 #.include <bsd.prog.mk>
51 #.include <bsd.xorg.mk>