diff -urN /usr/ports/x11-wm/aewm/Makefile x11-wm/aewm/Makefile
--- /usr/ports/x11-wm/aewm/Makefile	Sun Mar 17 18:55:29 2002
+++ x11-wm/aewm/Makefile	Tue Apr  9 04:47:37 2002
@@ -12,6 +12,7 @@
 
 MAINTAINER=	trevor@FreeBSD.org
 
+ALL_TARGET=	aewm
 GTKCLIENTS=	aemenu-gtk aepanel-gtk
 XAWCLIENTS=	set-gnome-pda \
 		aesession \
@@ -27,14 +28,11 @@
 WANT_GTK=	yes
 
 .include <bsd.port.pre.mk>
+
 .if defined(HAVE_GTK)
 USE_GTK=yes
 .endif
 
-.if !defined(HAVE_GTK)
-ALL_TARGET=	aewm
-.endif
-
 do-patch:
 	${PERL} -pi -e 's:/etc/X11/aewm/aewmrc:${PREFIX}/etc/aewmrc:g' \
 		${WRKSRC}/aewm.h
@@ -46,6 +44,15 @@
 		${WRKSRC}/clients/lib/aeclients.h
 .endif
 
+post-build:
+.if defined(HAVE_GTK)
+	@cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} \
+		${GTKCLIENTS} ${XAWCLIENTS}
+.else
+	@cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} \
+		${XAWCLIENTS}
+.endif
+
 pre-install:
 	${RM} -f ${PLIST}
 .for i in aewm aemenu aepanel ${XAWCLIENTS}
@@ -78,15 +85,13 @@
 .for i in ${GTKCLIENTS}
 	${INSTALL_PROGRAM} ${WRKSRC}/clients/${i} ${PREFIX}/bin
 .endfor
-.if defined(HAVE_GTK)
-	cd ${PREFIX}/bin && ${LN} -s aemenu-gtk aemenu && \
-		${LN} -s aepanel-gtk aepanel
+	${LN} -sf aemenu-gtk ${PREFIX}/bin/aemenu
+	${LN} -sf aepanel-gtk ${PREFIX}/bin/aepanel
 .else
-	cd ${PREFIX}/bin && ${LN} -s aemenu-xaw aemenu && \
-		${LN} -s aepanel-xaw aepanel
+	${LN} -sf aemenu-xaw ${PREFIX}/bin/aemenu
+	${LN} -sf aepanel-xaw ${PREFIX}/bin/aepanel
 .endif
 	${INSTALL_DATA} ${WRKSRC}/clients/clientsrc.sample ${EXAMPLESDIR}
-.endif
 	${INSTALL_DATA} ${WRKSRC}/aewmrc.sample ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/aewmrc.sample ${PREFIX}/etc/aewmrc
 	${INSTALL_DATA} ${WRKSRC}/clients/clientsrc.sample \