diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-06-07 18:44:50 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-06-07 18:44:50 +0000 |
| commit | 2241a72a39ebdd465683685d82f0efb9a992981b (patch) | |
| tree | 63334e5ec9d2311006b02e7d9332728b32b7311c | |
| parent | Upgrade nqc to version 2.4.r3. (diff) | |
Have GNOME extensions concatenate at end of PKGNAMESUFFIX instead
of overwriting it
Approved by: sobomax (portmgr hat)
Notes
Notes:
svn path=/head/; revision=60790
| -rw-r--r-- | Mk/bsd.gnome.mk | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 336ebc24ac79..d5f8b152fcc6 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -228,7 +228,11 @@ ESD_CONFIG?= ${LOCALBASE}/bin/esd-config CONFIGURE_ENV+= ESD_CONFIG="${ESD_CONFIG}" MAKE_ENV+= ESD_CONFIG="${ESD_CONFIG}" .if defined(HAVE_ESOUND) +.if defined(PKGNAMESUFFIX) +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-esound +.else PKGNAMESUFFIX= -esound +.endif CONFIGURE_ENV+= HAVE_ESOUND=${HAVE_ESOUND} MAKE_ENV+= HAVE_ESOUND=${HAVE_ESOUND} .endif @@ -240,7 +244,11 @@ GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config CONFIGURE_ENV+= GLIB_CONFIG="${GLIB_CONFIG}" MAKE_ENV+= GLIB_CONFIG="${GLIB_CONFIG}" .if defined(HAVE_GLIB) +.if defined(PKGNAMESUFFIX) +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-glib +.else PKGNAMESUFFIX= -glib +.endif CONFIGURE_ENV+= HAVE_GLIB=${HAVE_GLIB} MAKE_ENV+= HAVE_GLIB=${HAVE_GLIB} .endif @@ -252,7 +260,11 @@ GTK_CONFIG?= ${X11BASE}/bin/gtk12-config CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" MAKE_ENV+= GTK_CONFIG="${GTK_CONFIG}" .if defined(HAVE_GTK) +.if defined(PKGNAMESUFFIX) +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gtk +.else PKGNAMESUFFIX= -gtk +.endif CONFIGURE_ENV+= HAVE_GTK=${HAVE_GTK} MAKE_ENV+= HAVE_GTK=${HAVE_GTK} .endif @@ -264,7 +276,11 @@ IMLIB_CONFIG?= ${X11BASE}/bin/imlib-config CONFIGURE_ENV+= IMLIB_CONFIG="${IMLIB_CONFIG}" MAKE_ENV+= IMLIB_CONFIG="${IMLIB_CONFIG}" .if defined(HAVE_IMLIB) +.if defined(PKGNAMESUFFIX) +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-imlib +.else PKGNAMESUFFIX= -imlib +.endif CONFIGURE_ENV+= HAVE_IMLIB=${HAVE_IMLIB} MAKE_ENV+= HAVE_IMLIB=${HAVE_IMLIB} .endif @@ -292,7 +308,11 @@ GNOME_CONFIG?= ${X11BASE}/bin/gnome-config CONFIGURE_ENV+= GNOME_CONFIG="${GNOME_CONFIG}" MAKE_ENV+= GNOME_CONFIG="${GNOME_CONFIG}" .if defined(HAVE_GNOME) +.if defined(PKGNAMESUFFIX) +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gnome +.else PKGNAMESUFFIX= -gnome +.endif CONFIGURE_ENV+= HAVE_GNOME=${HAVE_GNOME} MAKE_ENV+= HAVE_GNOME=${HAVE_GNOME} PLIST_SUB+= GNOME:="" NOGNOME:="@comment " DATADIR="share/gnome" |