| 1 |
jer 10/02/08 11:10:29 |
| 2 |
|
| 3 |
Modified: xrootconsole-0.6.makefile.patch |
| 4 |
Log: |
| 5 |
Respect CFLAGS (bug #241552), LDFLAGS, CC. Do not strip (bug #241488). Install man pages properly (bug #248591). |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: xrootconsole-0.6.makefile.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- xrootconsole-0.6.makefile.patch 16 Jun 2005 23:55:59 -0000 1.1 |
| 22 |
+++ xrootconsole-0.6.makefile.patch 8 Feb 2010 11:10:29 -0000 1.2 |
| 23 |
@@ -1,6 +1,30 @@ |
| 24 |
---- Makefile.orig 2005-03-06 16:46:36.325616480 +0900 |
| 25 |
-+++ Makefile 2005-03-06 16:46:55.140756144 +0900 |
| 26 |
-@@ -76,5 +76,7 @@ |
| 27 |
+--- xrootconsole-0.6/Makefile.org 2004-02-20 22:53:28.000000000 +0100 |
| 28 |
++++ xrootconsole-0.6/Makefile 2010-02-08 12:01:11.000000000 +0100 |
| 29 |
+@@ -43,20 +43,16 @@ |
| 30 |
+ else echo Bleeding Edge Version; \ |
| 31 |
+ fi;) |
| 32 |
+ |
| 33 |
+-CC = gcc |
| 34 |
+-CPPFLAGS = |
| 35 |
+- |
| 36 |
+ # for production |
| 37 |
+-CFLAGS = -O2 -DNDEBUG -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION)\"" \ |
| 38 |
+- -I /usr/X11R6/include |
| 39 |
+-LDFLAGS = -s |
| 40 |
++CFLAGS += -DNDEBUG -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION)\"" \ |
| 41 |
++ $(shell pkg-config --cflags x11) |
| 42 |
+ |
| 43 |
+ # for testing |
| 44 |
+ #CFLAGS = -g -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION) (debug build)\"" \ |
| 45 |
+ -I /usr/X11R6/include |
| 46 |
+ #LDFLAGS = |
| 47 |
+ |
| 48 |
+-LIBS = -L/usr/X11R6/lib -lX11 -lutil |
| 49 |
++LIBS = $(shell pkg-config --libs x11) -lutil |
| 50 |
+ |
| 51 |
+ OBJS = main.o util.o |
| 52 |
+ |
| 53 |
+@@ -76,5 +72,7 @@ |
| 54 |
rm -f $(EXEC) *.o core *~ |
| 55 |
|
| 56 |
install: $(EXEC) |
Archives