D28582.id83861.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D28582.id83861.diff
View Options

	diff --git a/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc b/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc
	--- a/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc
	+++ b/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc
	@@ -4608,7 +4608,7 @@

	====

	-Sometime, only some version of another port is incompatible, in this case, use the full package name, with the version, and use shell globs, like `*` and `?` to make sure all possible versions are matched.
	+Sometimes, only certain versions of another port are incompatible. When this is the case, use the full package name including the version. If necessary, use shell globs like `*` and `?` so that all necessary versions are matched.

	[[conflicts-ex2]]
	.Using `CONFLICTS*` With Globs.
	@@ -4631,6 +4631,13 @@
	package:deskutils/gnotime[] does not have any conflicts line because its current version does not conflict with anything else.
	====

	+The variable `DISABLE_CONFLICTS` may be temporarily set when making targets that are not affected by conflicts. The variable is not to be set in port Makefiles.
	+
	+[source,bash]
	+....
	+% make -DDISABLE_CONFLICTS patch
	+....
	+
	[[install]]
	== Installing Files