diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-04-12 09:03:21 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-04-12 09:03:21 +0800 |
| commit | d714a4b7c6b0ca79777c4672bde90235b6235e1b (patch) | |
| tree | 7e71a01fbcee2f4a64d891d88702abdff7c05ba8 /Mk/bsd.gnome.mk | |
| parent | e1583effeb1fc992a8f79373e8b997254546c832 (diff) | |
| download | marcuscom-ports-d714a4b7c6b0ca79777c4672bde90235b6235e1b.tar marcuscom-ports-d714a4b7c6b0ca79777c4672bde90235b6235e1b.tar.gz marcuscom-ports-d714a4b7c6b0ca79777c4672bde90235b6235e1b.tar.bz2 marcuscom-ports-d714a4b7c6b0ca79777c4672bde90235b6235e1b.tar.lz marcuscom-ports-d714a4b7c6b0ca79777c4672bde90235b6235e1b.tar.xz marcuscom-ports-d714a4b7c6b0ca79777c4672bde90235b6235e1b.tar.zst marcuscom-ports-d714a4b7c6b0ca79777c4672bde90235b6235e1b.zip | |
Remove the global CONFIGURE_TARGET, and add it as a dependency of glib20.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@572 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'Mk/bsd.gnome.mk')
| -rw-r--r-- | Mk/bsd.gnome.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 0c4ddc3ba..9b4377fc5 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -203,6 +203,7 @@ libpanel_GNOME_DESKTOP_VERSION=1 glib20_LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc +glib20_CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} atk_LIB_DEPENDS= atk-1.0.300:${PORTSDIR}/devel/atk atk_DETECT= ${LOCALBASE}/libdata/pkgconfig/atk.pc @@ -452,9 +453,6 @@ USE_GNOME+= imlib USE_GNOME+=gnomeprefix gnomehack gtkhtml libpanel . endif -# Set a reasonable (overrideable) configure target for GNOME apps. -CONFIGURE_TARGET?= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} - # First of all expand all USE_GNOME_IMPL recursively . for component in ${_USE_GNOME_ALL} . for subcomponent in ${${component}_USE_GNOME_IMPL} @@ -494,6 +492,10 @@ CONFIGURE_ARGS+=${${component}_CONFIGURE_ARGS} CONFIGURE_ENV+= ${${component}_CONFIGURE_ENV} MAKE_ENV+= ${${component}_MAKE_ENV} +. if !defined(CONFIGURE_TARGET) && defined(${component}_CONFIGURE_TARGET) +CONFIGURE_TARGET=${${component}_CONFIGURE_TARGET} +. endif + . if defined(${component}_PRE_PATCH) GNOME_PRE_PATCH+= ${${component}_PRE_PATCH} . endif |