Blob

Date:
Message:
ensure that we always install static binaries to gotweb's chroot Compile static libexec binaries for gotweb, keeping them separate from the main build. Use the same source files but a separate set of Makefiles. Previously, 'make web-install' installed whichever libexec binaries had already been built, and if those happened to be dynamically linked they failed to run inside the chroot which resulted in "privsep peer process closed pipe" being rendered on the index page.
Actions:
History | Blame | Raw File
1 .PATH:${.CURDIR}/../lib

3 SUBDIR = libexec

5 .include "../got-version.mk"

6 .include "Makefile.inc"

8 PROG =		gotweb

9 SRCS =		gotweb.c parse.y blame.c commit_graph.c delta.c diff.c \

10 		diffreg.c error.c fileindex.c object.c object_cache.c \

11 		object_idset.c object_parse.c opentemp.c path.c pack.c \

12 		privsep.c reference.c repository.c sha1.c worktree.c \

13 		inflate.c buf.c rcsutil.c diff3.c lockfile.c \

14 		deflate.c object_create.c delta_cache.c

15 MAN =		${PROG}.conf.5

17 CPPFLAGS +=	-I${.CURDIR}/../include -I${.CURDIR}/../lib -I${.CURDIR} \

18 		-I${KCGIBASE}/include

19 LDADD +=	-L${KCGIBASE}/lib -lkcgihtml -lkcgi

20 LDSTATIC =	${STATIC}

22 .if ${GOT_RELEASE} != "Yes"

23 NOMAN = Yes

24 .endif

26 realinstall:

27 	if [ ! -d ${CGI_DIR}/. ]; then \

28 		${INSTALL} -d -o root -g daemon -m 755 ${CGI_DIR}; \

29 	fi

30 	if [ ! -d ${PUB_REPOS_DIR}/. ]; then \

31 		${INSTALL} -d -o root -g daemon -m 755 ${PUB_REPOS_DIR}; \

32 	fi

33 	${INSTALL} -c -o ${WWWUSR} -g ${WWWGRP} -m 0755 ${PROG} \

34 	    ${CGI_DIR}/${PROG}

35 	if [ ! -d ${TMPL_DIR}/. ]; then \

36 		${INSTALL} -d -o root -g daemon -m 755 ${TMPL_DIR}; \

37 	fi

38 	${INSTALL} -c -o ${WWWUSR} -g ${WWWGRP} -m 0755 \

39 	    ${.CURDIR}/files/cgi-bin/gw_tmpl/* ${TMPL_DIR}

40 	if [ ! -d ${HTTPD_DIR}/. ]; then \

41 		${INSTALL} -d -o root -g daemon -m 755 ${HTTPD_DIR}; \

42 	fi

43 	if [ ! -d ${TMP_DIR}/. ]; then \

44 		${INSTALL} -d -o ${WWWUSR} -g ${WWWGRP} -m 755 ${TMP_DIR}; \

45 	fi

46 	if [ ! -d ${PROG_DIR}/. ]; then \

47 		${INSTALL} -d -o root -g daemon -m 755 ${PROG_DIR}; \

48 	fi

49 	${INSTALL} -c -o ${WWWUSR} -g ${WWWGRP} -m 0755 \

50 	    ${.CURDIR}/files/htdocs/${PROG}/* ${PROG_DIR}

52 .include <bsd.prog.mk>