diff options
Diffstat (limited to 'package/evilwm/patches/patch-Makefile')
| -rw-r--r-- | package/evilwm/patches/patch-Makefile | 77 |
1 files changed, 36 insertions, 41 deletions
diff --git a/package/evilwm/patches/patch-Makefile b/package/evilwm/patches/patch-Makefile index d45dcee52..856d88a33 100644 --- a/package/evilwm/patches/patch-Makefile +++ b/package/evilwm/patches/patch-Makefile @@ -1,46 +1,41 @@ -do not strip by install ---- evilwm-1.0.1.orig/Makefile 2009-03-30 12:37:06.000000000 +0200 -+++ evilwm-1.0.1/Makefile 2010-01-27 08:14:46.000000000 +0100 -@@ -1,11 +1,11 @@ - # If you don't use CC --CC = gcc -+CC ?= gcc +--- evilwm-1.1.0.orig/Makefile 2011-07-03 16:14:21.000000000 +0200 ++++ evilwm-1.1.0/Makefile 2011-12-01 06:25:59.048654953 +0100 +@@ -26,9 +26,13 @@ OPT_CPPFLAGS += -DINFOBANNER + # Uncomment for mouse support. Recommended. + OPT_CPPFLAGS += -DMOUSE - # Edit this line if you don't want evilwm to install under /usr. - # Note that $(DESTDIR) is used by the Debian build process. - prefix = $(DESTDIR)/usr +++XROOT ?= /usr/X11R6 ++OPT_CPPFLAGS += -I$(XROOT)/include ++OPT_LDLIBS += -L$(XROOT)/lib ++ + # Uncomment to support the Xrandr extension (thanks, Yura Semashko). +-OPT_CPPFLAGS += -DRANDR +-OPT_LDLIBS += -lXrandr ++#OPT_CPPFLAGS += -DRANDR ++#OPT_LDLIBS += -lXrandr --XROOT = /usr/X11R6 -+XROOT ?= /usr/X11R6 - INCLUDES = -I$(XROOT)/include - LDPATH = -L$(XROOT)/lib - LIBS = -lX11 -@@ -35,8 +35,8 @@ LIBS += -lXext - # Be sure that libXrandr is in your library search directory (e.g., under - # Solaris, it is in /usr/X11R6/lib, so can be built against with the default - # XPATH above, but won't necessarily be in the library search path). --DEFINES += -DRANDR --LIBS += -lXrandr -+#DEFINES += -DRANDR -+#LIBS += -lXrandr + # Uncomment to support shaped windows. + OPT_CPPFLAGS += -DSHAPE +@@ -74,10 +78,11 @@ OPT_CPPFLAGS += -DWARP_POINTER + # Build tools - # Uncomment for mouse support. You probably want this. - DEFINES += -DMOUSE -@@ -71,7 +71,7 @@ distname = evilwm-$(version) - #DEFINES += -DXDEBUG # show some X calls + # Change this if you don't use gcc: +-CC = gcc ++CC ?= gcc - DEFINES += -DVERSION=\"$(version)\" $(DEBIAN) --CFLAGS += $(INCLUDES) $(DEFINES) -Os -Wall -+CFLAGS += $(INCLUDES) $(DEFINES) -Wall - #CFLAGS += $(INCLUDES) $(DEFINES) -g -Wall - CFLAGS += -W -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls - LDFLAGS += $(LDPATH) $(LIBS) -@@ -93,7 +93,7 @@ evilwm: $(OBJS) - install: evilwm - if [ -f evilwm.exe ]; then mv evilwm.exe evilwm; fi - mkdir -p $(prefix)/bin $(prefix)/share/man/man1 -- install -s evilwm $(prefix)/bin -+ install evilwm $(prefix)/bin - install evilwm.1 $(prefix)/share/man/man1 - #gzip -9 $(prefix)/share/man/man1/evilwm.1 + # Override if desired: +-CFLAGS = -Os -std=c99 ++CFLAGS ?= ++CFLAGS += -std=c99 + WARN = -Wall -W -Wstrict-prototypes -Wpointer-arith -Wcast-align \ + -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings \ + -Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls +@@ -95,7 +100,7 @@ INSTALL = install + INSTALL_STRIP = -s + INSTALL_DIR = $(INSTALL) -d -m 0755 + INSTALL_FILE = $(INSTALL) -m 0644 +-INSTALL_PROGRAM = $(INSTALL) -m 0755 $(INSTALL_STRIP) ++INSTALL_PROGRAM = $(INSTALL) -m 0755 + ############################################################################ + # You shouldn't need to change anything beyond this point |