3 files changed, 32 insertions, 10 deletions

diff --git a/x11-wm/golem/Makefile b/x11-wm/golem/Makefile
index 98c10fd55b02..68f07b4cf6ce 100644
--- a/x11-wm/golem/Makefile
+++ b/x11-wm/golem/Makefile
@@ -38,14 +38,7 @@ post-patch:
 			${WRKSRC}/complib/asm-generic/cl_atomic_asm.h \
 			${WRKSRC}/complib/asm-ppc/cl_atomic_asm.h
 
-# avoid using standard MAKE_ENV
-do-build:
-	@cd ${BUILD_WRKSRC}; \
-		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
-
-do-install:
-	@cd ${INSTALL_WRKSRC}; \
-		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
+post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/golem
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/golem/plugins/*.so
 
diff --git a/x11-wm/golem/files/patch-Makefile.macros.gnu.in b/x11-wm/golem/files/patch-Makefile.macros.gnu.in
new file mode 100644
index 000000000000..b6744622c2e5
--- /dev/null
+++ b/x11-wm/golem/files/patch-Makefile.macros.gnu.in
@@ -0,0 +1,20 @@
+--- Makefile.macros.gnu.in.orig	2006-03-01 18:59:55 UTC
++++ Makefile.macros.gnu.in
+@@ -56,17 +56,13 @@ ifdef PROG
+   BUILDDIR=../build-bin
+   BUILDPROG=$(BUILDDIR)/$(PROG)
+ 
+-  ifndef CFLAGS
+     CFLAGS+=-I$(GOLEM_HOME) -I$(GOLEM_HOME)/complib -I. @CFLAGS@ @X_CFLAGS@
+     CFLAGS+=@DEFS@ -DLIBDIR=\"$(libdir)\" -DDATADIR=\"$(datadir)\"
+-  endif
+-  ifndef LDFLAGS
+     LDFLAGS=	@LDFLAGS@ @X_LIBS@ @EXPORT_FLAG@
+     LDFLAGS+=	@LIBS@ -lX11 -lXpm -lXext
+     ifdef LIBS 
+       LDFLAGS+= -L$(BUILDA) -L$(BUILDLIB) 
+     endif
+-  endif
+ 
+ endif
+ 
diff --git a/x11-wm/golem/files/patch-Makefile.rules.gnu.in b/x11-wm/golem/files/patch-Makefile.rules.gnu.in
index 4011d01ecef8..0e065c535e6d 100644
--- a/x11-wm/golem/files/patch-Makefile.rules.gnu.in
+++ b/x11-wm/golem/files/patch-Makefile.rules.gnu.in
@@ -1,5 +1,14 @@
---- Makefile.rules.gnu.in.orig	2014-01-22 17:53:46.492137556 +0800
-+++ Makefile.rules.gnu.in	2014-01-22 17:58:12.855113204 +0800
+--- Makefile.rules.gnu.in.orig	2006-03-01 18:59:55 UTC
++++ Makefile.rules.gnu.in
+@@ -15,7 +15,7 @@ ifdef LIBS
+   LINK_LIBS=$(strip $(foreach lib,$(LIBS),-l$(lib)))
+ endif
+ 
+-ifndef LIBDIR
++ifneq ($(origin LIBDIR), file)
+   LIBDIR=.
+ endif
+ ifdef LIB
 @@ -179,17 +179,17 @@ menuconfig:
  
  install-bin: @INSTALL_PLUGINS@