diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
| commit | c57d0300bd42fabd8eeda2a95b6c3960d6e7ce07 (patch) | |
| tree | b53bc538246b5a900300b5c6b5ea740f978196f4 /package/evilwm | |
| parent | cf4b3959527339206254b8c8fc44deb391beeb10 (diff) | |
| parent | 023560ac69a2ecf5659c668c26c0af6b5612a46b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/nspr/Makefile
Diffstat (limited to 'package/evilwm')
| -rw-r--r-- | package/evilwm/Makefile | 4 | ||||
| -rw-r--r-- | package/evilwm/patches/patch-Makefile | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile index 1dabdf9d5..95b1a422a 100644 --- a/package/evilwm/Makefile +++ b/package/evilwm/Makefile @@ -18,9 +18,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,EVILWM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIG_STYLE:= manual + MAKE_FLAGS+= XROOT="$(STAGING_DIR)/usr" -BUILD_STYLE:= auto -INSTALL_STYLE:= auto post-install: $(INSTALL_DIR) $(IDIR_EVILWM)/usr/bin diff --git a/package/evilwm/patches/patch-Makefile b/package/evilwm/patches/patch-Makefile index a945a534f..d45dcee52 100644 --- a/package/evilwm/patches/patch-Makefile +++ b/package/evilwm/patches/patch-Makefile @@ -1,5 +1,6 @@ +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-22 17:14:53.000000000 +0100 ++++ 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 @@ -34,3 +35,12 @@ #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 + |