PERFORCE change 101928 for review
Gabor Kovesdan
gabor at FreeBSD.org
Wed Jul 19 13:48:12 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=101928
Change 101928 by gabor at gabor_spitfire on 2006/07/19 13:47:48
Add some path checks for PREFIX as well. For this I needed to
move that part of the code a bit. These checks can also be
skipped by setting IGNORE_PATH_CHECKS.
Affected files ...
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#44 edit
Differences ...
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#44 (text+ko) ====
@@ -1307,32 +1307,6 @@
.endif
DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
-# 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 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
-
# These need to be absolute since we don't know how deep in the ports
# tree we are and thus can't go relative. They can, of course, be overridden
# by individual Makefiles or local system make configuration.
@@ -1418,6 +1392,39 @@
.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
More information about the p4-projects
mailing list