Move some of the USE_* compatability macros outside of the

if defined(USE_GNOME) check as those macros will not exist if USE_GNOME
is defined.

Reported by:	bento c/o kris

1 files changed, 8 insertions, 7 deletions

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index b4c9b28..5056f28 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -431,13 +431,6 @@ HAVE_GNOME+=	${component}
 
 .if defined(_POSTMKINCLUDED)
 
-# Hack USE_GNOME to the modular nfrastructure for port mataintainers that
-# didn't do so themselves.  This will allow us to get rid of the old
-# GNOME porting infrastructure more quickly.
-.if defined(USE_GNOME)
-. if ${USE_GNOME}=="yes"
-USE_GNOME=gnomeprefix gnomehack gtkhtml libpanel
-. endif
 .if defined(USE_GTK)
 USE_GNOME=	gtk12
 .endif
@@ -454,6 +447,14 @@ USE_GNOME=	glib12
 USE_GNOME=	gnomeprefix gnomehack libcapplet
 .endif
 
+# Hack USE_GNOME to the modular nfrastructure for port mataintainers that
+# didn't do so themselves.  This will allow us to get rid of the old
+# GNOME porting infrastructure more quickly.
+.if defined(USE_GNOME)
+. if ${USE_GNOME}=="yes"
+USE_GNOME=gnomeprefix gnomehack gtkhtml libpanel
+. endif
+
 # Set a reasonable (overrideable) configure target for GNOME apps.
 CONFIGURE_TARGET?=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}