Archives
Archives
| 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-4.2_p20110913-Makefile.patch cwm-4.2_p20111229-Makefile.patch cwm-20110726-Makefile.patch cwm-20110323-Makefile.patch cwm-20111229-Makefile.patch |
| Date: | Wed, 02 May 2012 13:19:38 |
| Message-Id: | 20120502131925.8B63D2004C@flycatcher.gentoo.org |
| 1 | xmw 12/05/02 13:19:25 |
| 2 | |
| 3 | Added: cwm-4.2_p20110913-Makefile.patch |
| 4 | cwm-4.2_p20111229-Makefile.patch |
| 5 | Removed: cwm-20110726-Makefile.patch |
| 6 | cwm-20110323-Makefile.patch |
| 7 | cwm-20111229-Makefile.patch |
| 8 | Log: |
| 9 | Version bump, renumber to BSD release version. |
| 10 | |
| 11 | (Portage version: 2.1.10.49/cvs/Linux x86_64) |
| 12 | |
| 13 | Revision Changes Path |
| 14 | 1.1 x11-wm/cwm/files/cwm-4.2_p20110913-Makefile.patch |
| 15 | |
| 16 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/cwm/files/cwm-4.2_p20110913-Makefile.patch?rev=1.1&view=markup |
| 17 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/cwm/files/cwm-4.2_p20110913-Makefile.patch?rev=1.1&content-type=text/plain |
| 18 | |
| 19 | Index: cwm-4.2_p20110913-Makefile.patch |
| 20 | =================================================================== |
| 21 | --- cwm-20110726/Makefile |
| 22 | +++ cwm-20110726/Makefile |
| 23 | @@ -15,16 +15,14 @@ |
| 24 | kbfunc.o mousefunc.o font.o strlcpy.o strlcat.o y.tab.o \ |
| 25 | strtonum.o fgetln.o |
| 26 | |
| 27 | -X11BASE= /usr |
| 28 | |
| 29 | -CPPFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/freetype2 -I. |
| 30 | +CPPFLAGS+= $(shell pkg-config --cflags-only-I xft) |
| 31 | |
| 32 | -CFLAGS+= -Wall -O2 -g |
| 33 | +CFLAGS+= |
| 34 | |
| 35 | -LDADD+= -L${X11BASE}/lib -lXft -lXrender -lX11 -lxcb -lXau -lXdmcp \ |
| 36 | - -lfontconfig -lexpat -lfreetype -lz -lXinerama -lXrandr -lXext |
| 37 | +LDADD+= $(shell pkg-config --libs xft xinerama xrandr ) |
| 38 | |
| 39 | -MANDIR= ${X11BASE}/man/man |
| 40 | +MANDIR= /usr/share/man |
| 41 | MAN= cwm.1 cwmrc.5 |
| 42 | |
| 43 | CLEANFILES= cwm.cat1 cwmrc.cat5 |
| 44 | @@ -45,9 +43,9 @@ |
| 45 | $(CC) -c $(CFLAGS) $(CPPFLAGS) $< |
| 46 | |
| 47 | install: ${PROG} |
| 48 | - install -m 755 cwm /usr/local/bin/ |
| 49 | - install -m 644 cwm.1 /usr/local/man/man1 |
| 50 | - install -m 644 cwmrc.5 /usr/local/man/man5 |
| 51 | + install -D -m 755 cwm $(DESTDIR)$(BINDIR)/cwm |
| 52 | + install -D -m 644 cwm.1 $(DESTDIR)$(MANDIR)/man1/cwm.1 |
| 53 | + install -D -m 644 cwmrc.5 $(DESTDIR)$(MANDIR)/man5/cwmrc.5 |
| 54 | |
| 55 | #.include <bsd.prog.mk> |
| 56 | #.include <bsd.xorg.mk> |
| 57 | |
| 58 | |
| 59 | |
| 60 | 1.1 x11-wm/cwm/files/cwm-4.2_p20111229-Makefile.patch |
| 61 | |
| 62 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/cwm/files/cwm-4.2_p20111229-Makefile.patch?rev=1.1&view=markup |
| 63 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/cwm/files/cwm-4.2_p20111229-Makefile.patch?rev=1.1&content-type=text/plain |
| 64 | |
| 65 | Index: cwm-4.2_p20111229-Makefile.patch |
| 66 | =================================================================== |
| 67 | --- cwm-20111229/Makefile |
| 68 | +++ cwm-20111229/Makefile |
| 69 | @@ -16,7 +16,7 @@ |
| 70 | |
| 71 | CPPFLAGS+= `pkg-config --cflags fontconfig x11 xft xinerama xrandr` |
| 72 | |
| 73 | -CFLAGS= -Wall -O2 -g |
| 74 | +CFLAGS?= -Wall -O2 -g |
| 75 | |
| 76 | LDFLAGS+= `pkg-config --libs fontconfig x11 xft xinerama xrandr` |