diff options
| author | Trevor Johnson <trevor@FreeBSD.org> | 2002-05-18 23:29:51 +0000 |
|---|---|---|
| committer | Trevor Johnson <trevor@FreeBSD.org> | 2002-05-18 23:29:51 +0000 |
| commit | e8624e6bdd93bfb0071cb248c88bd37a0debd22c (patch) | |
| tree | 62f197c4fe476c632c5aba1d4bfe9a9e4d935e3d | |
| parent | Update to 1.3.6. (diff) | |
Fix non-GTK installation.
PR: 36897
Submitted by: KATO Tsuguru
| -rw-r--r-- | x11-wm/aewm/Makefile | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile index 47f5b4c7fd34..93cb6d7e13d0 100644 --- a/x11-wm/aewm/Makefile +++ b/x11-wm/aewm/Makefile @@ -12,8 +12,7 @@ MASTER_SITES= http://www.red-bean.com/~decklin/aewm/ MAINTAINER= trevor@FreeBSD.org -BROKEN= "Does not install correctly" - +ALL_TARGET= aewm GTKCLIENTS= aemenu-gtk aepanel-gtk XAWCLIENTS= set-gnome-pda \ aesession \ @@ -33,10 +32,6 @@ WANT_GTK= yes 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 @@ -48,6 +43,15 @@ do-patch: ${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} @@ -80,7 +84,6 @@ do-install: .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 .else @@ -88,7 +91,6 @@ do-install: ${LN} -s aepanel-xaw 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 \ |