PERFORCE change 101983 for review

[Gabor Kovesdan]

http://perforce.freebsd.org/chv.cgi?CH=101983

Change 101983 by gabor at gabor_spitfire on 2006/07/20 10:55:56

	Move the DESTDIR and PREFIX sanity checks to a better place to
	make it work on pointyhat.
	
	Submitted by:	erwin

Affected files ...

.. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#50 edit

Differences ...

==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#50 (text+ko) ====

@@ -1392,38 +1392,6 @@
 .endif
 .endif
 
-# These do some path checks if DESTDIR is set correctly.
-# You can force skipping these test by defining IGNORE_PATH_CHECKS
-.if !defined(IGNORE_PATH_CHECKS)
-.if (${PREFIX:C,(^.).*,\1,} != "/")
-.BEGIN:
-	@${ECHO_MSG} "PREFIX must be defined as an absolute path so that when 'make'"
-	@${ECHO_MSG} "is invoked in the work area PREFIX points to the right place."
-	@${FALSE}
-.endif
-.if defined(DESTDIR)
-.if (${DESTDIR:C,(^.).*,\1,} != "/")
-.if ${DESTDIR} == "/"
-.BEGIN:
-	@${ECHO_MSG} "You can't set DESTDIR to /. Please re-run make with"
-	@${ECHO_MSG} "DESTDIR unset."
-	@${FALSE}
-.else
-.BEGIN:
-	@${ECHO_MSG} "DESTDIR must be defined as an absolute path so that when 'make'"
-	@${ECHO_MSG} "is invoked in the work area DESTDIR points to the right place."
-	@${FALSE}
-.endif
-.endif
-.if (${DESTDIR:C,^.*(/)$$,\1,} == "/")
-.BEGIN:
-	@${ECHO_MSG} "DESTDIR can't have a trailing slash. Please remove the trailing"
-	@${ECHO_MSG} "slash and re-run 'make'"
-	@${FALSE}
-.endif
-.endif
-.endif
-
 PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
 
 .if ${OSVERSION} >= 500036
@@ -1547,6 +1515,38 @@
 .include "${PORTSDIR}/Mk/bsd.sdl.mk"
 .endif
 
+# These do some path checks if DESTDIR is set correctly.
+# You can force skipping these test by defining IGNORE_PATH_CHECKS
+.if !defined(IGNORE_PATH_CHECKS)
+.if (${PREFIX:C,(^.).*,\1,} != "/")
+.BEGIN:
+	@${ECHO_MSG} "PREFIX must be defined as an absolute path so that when 'make'"
+	@${ECHO_MSG} "is invoked in the work area PREFIX points to the right place."
+	@${FALSE}
+.endif
+.if defined(DESTDIR)
+.if (${DESTDIR:C,(^.).*,\1,} != "/")
+.if ${DESTDIR} == "/"
+.BEGIN:
+	@${ECHO_MSG} "You can't set DESTDIR to /. Please re-run make with"
+	@${ECHO_MSG} "DESTDIR unset."
+	@${FALSE}
+.else
+.BEGIN:
+	@${ECHO_MSG} "DESTDIR must be defined as an absolute path so that when 'make'"
+	@${ECHO_MSG} "is invoked in the work area DESTDIR points to the right place."
+	@${FALSE}
+.endif
+.endif
+.if (${DESTDIR:C,^.*(/)$$,\1,} == "/")
+.BEGIN:
+	@${ECHO_MSG} "DESTDIR can't have a trailing slash. Please remove the trailing"
+	@${ECHO_MSG} "slash and re-run 'make'"
+	@${FALSE}
+.endif
+.endif
+.endif
+
 .if ${OSVERSION} >= 502123
 X_WINDOW_SYSTEM ?= xorg
 .elif (${OSVERSION} >= 450005 && !defined(XFREE86_VERSION)) || \