diff options
| author | agc <agc> | 2000-07-15 20:39:13 +0000 |
|---|---|---|
| committer | agc <agc> | 2000-07-15 20:39:13 +0000 |
| commit | 2e47c2f37e9c8e19fbffffeab1f56ce32e02d121 (patch) | |
| tree | 16d493248b3dac046feba96b3b2a8fb8abcc8be3 /x11/gdm/Makefile | |
| parent | 820a71a77a3d89ccc6a901be882dcc2ebe3a5d26 (diff) | |
| download | pkgsrc-2e47c2f37e9c8e19fbffffeab1f56ce32e02d121.tar.gz | |
Instead of the clunky SHOW_PKG_PREFIX, introduce an EVAL_PREFIX definition,
which takes entries of the format <make-definition-name>=<pkgname>. This
has not been added to MAKEFLAGS because (a) premature optimisation is the
root of all evil, and (b) because the .for loop used to implement this
shows the wrong results when multiple prefices are evaluated.
Modify all the package Makefiles to use EVAL_PREFIX, thereby simplifying
them considerably.
ALso simplify the logic to calculate the prefix as well.
Diffstat (limited to 'x11/gdm/Makefile')
| -rw-r--r-- | x11/gdm/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 82b61a5f9fa..859c9abb71a 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:27 agc Exp $ +# $NetBSD: Makefile,v 1.13 2000/07/15 20:39:25 agc Exp $ DISTNAME= gdm-2.0beta4 PKGNAME= gdm-2.0b4 @@ -20,6 +20,8 @@ USE_X11BASE= yes CPPFLAGS= -I${LOCALBASE}/include LIBS= -lintl LOCALSTATEDIR= /var/gnome + +EVAL_PREFIX+= KDEBASEDIR=kdebase CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LIBS="${LIBS}" \ LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} @@ -62,7 +64,7 @@ post-build: cd ${WRKSRC}/config; \ ${RM} -f KDE Xsession; \ ${ECHO} '#! ${SH}' >KDE; \ - ${ECHO} "export KDEDIR=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}`" >>KDE; \ + ${ECHO} "export KDEDIR=${KDEBASEDIR}" >>KDE; \ ${ECHO} 'exec $${KDEDIR}/bin/startkde $$@' >>KDE; \ ${ECHO} '#! ${SH}' >Xsession; \ ${ECHO} 'exec ${X11BASE}/lib/X11/xdm/Xsession $$@' >>Xsession; \ |