mirror of
https://git.freebsd.org/ports.git
synced 2025-06-15 01:30:33 -04:00
bb11e784bc
r569286 fixed manual port stage however it broke poudriere builds. This resulted in either a nested directory tree of $STAGEDIR/$PREFIX/bitkeeper/$PREFIX/bitkeeper under poudriere or simply $STAGEDIR when building by hand, making any conventional fix mutulally exclusive. To resolve we rename DESTDIR within the port to some arbitrary name, PDESTDIR, and set the port's BINDIR to /bitkeeper, from /usr/local/bitkeeper, to avoid the other source of nesting.
15 lines
422 B
Text
15 lines
422 B
Text
--- Makefile.orig 2018-12-29 05:21:08.000000000 -0800
|
|
+++ Makefile 2021-03-30 17:02:38.009421000 -0700
|
|
@@ -70,11 +70,7 @@
|
|
EXE=
|
|
# You can set this to anywhere you like and do a
|
|
# build production" and you'll have an installed BitKeeper.
|
|
- ifeq (,$(INSTALLED_BK))
|
|
- BINDIR := /usr/local/bitkeeper
|
|
- else
|
|
- BINDIR := $(shell "$(INSTALLED_BK)" bin)
|
|
- endif
|
|
+ BINDIR := /bitkeeper
|
|
INSTALL=install
|
|
RESOURCE=
|
|
endif
|