summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Noberasco <s4t4n@gentoo.org>2010-09-06 07:48:33 +0000
committerMichele Noberasco <s4t4n@gentoo.org>2010-09-06 07:48:33 +0000
commit91547a97a8c0868585560a8e2d357223c4cee30e (patch)
tree3aeca2ae4e0508e17bd41528dfb850dbefd0b84d /x11-plugins/wmacpimon/files
parentVersion bump to fix bug #328735 (diff)
downloadgentoo-2-91547a97a8c0868585560a8e2d357223c4cee30e.tar.gz
gentoo-2-91547a97a8c0868585560a8e2d357223c4cee30e.tar.bz2
gentoo-2-91547a97a8c0868585560a8e2d357223c4cee30e.zip
Reworked Makefile patch, simplified ebuild. Closes bug #336091.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'x11-plugins/wmacpimon/files')
-rw-r--r--x11-plugins/wmacpimon/files/Makefile.patch21
1 files changed, 16 insertions, 5 deletions
diff --git a/x11-plugins/wmacpimon/files/Makefile.patch b/x11-plugins/wmacpimon/files/Makefile.patch
index e4a759b83ebd..aab28fc89392 100644
--- a/x11-plugins/wmacpimon/files/Makefile.patch
+++ b/x11-plugins/wmacpimon/files/Makefile.patch
@@ -1,13 +1,24 @@
---- Makefile 2002-11-26 22:53:07.000000000 +0100
-+++ Makefile.new 2008-12-02 12:25:29.000000000 +0100
-@@ -11,8 +11,10 @@
+--- Makefile 2010-09-06 11:33:16.000000000 +0200
++++ Makefile.new 2010-09-06 11:36:28.000000000 +0200
+@@ -1,8 +1,5 @@
+-OPT = -O3 -DACPI
+-
+-CC = gcc
+-CFLAGS = $(OPT) -Wall -I/usr/X11R6/include
+-LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext
++CFLAGS += -DACPI -Wall -I/usr/X11R6/include
++LIBS = -DACPI -L/usr/X11R6/lib -lX11 -lXpm -lXext
+
+ SRCS = wmacpimon.c libacpi.c
+ OBJS = wmacpimon.o libacpi.o
+@@ -11,8 +8,10 @@
all: wmacpimon wmacpimond
wmacpimon: $(OBJS)
-+ $(CC) $(CFLAGS) -o wmacpimon $^ $(LDFLAGS)
++ $(CC) $(LDFLAGS) -o wmacpimon $^ $(LIBS)
wmacpimond: $(OBJZ)
-+ $(CC) $(CFLAGS) -o wmacpimond $^ $(LDFLAGS)
++ $(CC) $(LDFLAGS) -o wmacpimond $^ $(LIBS)
clean:
rm -f *.o *~ wmacpimon wmacpimond trace *.out *.bb *.bbg