diff options
| author | agc <agc> | 2000-07-11 10:30:43 +0000 |
|---|---|---|
| committer | agc <agc> | 2000-07-11 10:30:43 +0000 |
| commit | 90773b637e95c2a3c65a479cb2932dc0f79171a6 (patch) | |
| tree | 7c0c1909ca5b52d63b53523680bd467954b96383 /x11 | |
| parent | 422b1e78de20e3069f40bfc31e2863e1439b2438 (diff) | |
| download | pkgsrc-90773b637e95c2a3c65a479cb2932dc0f79171a6.tar.gz | |
Make this package cooperate with xpkgwedge better.
Use shell "for" loops in preference to make ".for" loops where possible.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gdm/Makefile | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 83cea838fee..4ebe8b2daa5 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2000/01/15 10:16:18 tron Exp $ +# $NetBSD: Makefile,v 1.10 2000/07/11 10:30:43 agc Exp $ DISTNAME= gdm-2.0beta4 PKGNAME= gdm-2.0b4 @@ -44,28 +44,28 @@ GDMCFGFILES= Default:Init.default/Default \ gnomerc:../gnomerc.default post-build: -.for FILE in DEINSTALL INSTALL - ${SED} -e 's#@@CP@@#${CP}#' \ - -e 's#@@LN@@#${LN}#' \ - -e 's#@@MKDIR@@#${MKDIR}#' \ - -e 's#@@RM@@#${RM}#' \ - -e 's#@@GDMCFGDIR@@#${GDMCFGDIR}#g' \ - -e 's#@@GDMCFGFILES@@#${GDMCFGFILES:C/.*://g}#g' \ - ${PKGDIR}/${FILE} >${WRKDIR}/${FILE} -.endfor -.for FILE in Default PostSession PreSession - cd ${WRKSRC}/config; \ - ${SED} -e 's#/usr/bin/X11#${X11BASE}/bin#g' ${FILE} >${FILE}.new; \ - ${MV} ${FILE}.new ${FILE}; \ - ${CHMOD} +x ${FILE} -.endfor - cd ${WRKSRC}/config; \ - ${RM} -f KDE Xsession; \ - ${ECHO} '#!${SH}' >KDE; \ - ${ECHO} 'export KDEDIR=${X11BASE}' >>KDE; \ - ${ECHO} 'exec $${KDEDIR}/bin/startkde $$@' >>KDE; \ - ${ECHO} '#!${SH}' >Xsession; \ - ${ECHO} 'exec ${X11BASE}/lib/X11/xdm/Xsession $$@' >>Xsession; \ + for f in DEINSTALL INSTALL; do \ + ${SED} -e 's#@@CP@@#${CP}#' \ + -e 's#@@LN@@#${LN}#' \ + -e 's#@@MKDIR@@#${MKDIR}#' \ + -e 's#@@RM@@#${RM}#' \ + -e 's#@@GDMCFGDIR@@#${GDMCFGDIR}#g' \ + -e 's#@@GDMCFGFILES@@#${GDMCFGFILES:C/.*://g}#g' \ + ${PKGDIR}/$$f >${WRKDIR}/$$f; \ + done + cd ${WRKSRC}/config; \ + for f in Default PostSession PreSession; do \ + ${SED} -e 's#/usr/bin/X11#${X11PREFIX}/bin#g' $$f >$$f.new; \ + ${MV} $$f.new $$f; \ + ${CHMOD} +x $$f; \ + done + cd ${WRKSRC}/config; \ + ${RM} -f KDE Xsession; \ + ${ECHO} '#! ${SH}' >KDE; \ + ${ECHO} "export KDEDIR=`${PKG_INFO} -qp kdebase | ${AWK} '{print $$2}'`" >>KDE; \ + ${ECHO} 'exec $${KDEDIR}/bin/startkde $$@' >>KDE; \ + ${ECHO} '#! ${SH}' >Xsession; \ + ${ECHO} 'exec ${X11BASE}/lib/X11/xdm/Xsession $$@' >>Xsession; \ ${CHMOD} +x KDE Xsession post-install: |