71e8db2f6a
For such a huge increase in version number there are surprisingly few changes: mostly minor changes and bugfixes, plus OCaml and other compatibility updates. The build system has changed to Dune, and the persistent storage library has been split off into ocsipersist.
86 lines
3.6 KiB
Text
86 lines
3.6 KiB
Text
$NetBSD: patch-Makefile,v 1.5 2022/05/20 07:04:07 jaapb Exp $
|
|
|
|
Use BSD_* installation commands
|
|
|
|
--- Makefile.orig 2021-07-12 10:00:50.000000000 +0000
|
|
+++ Makefile
|
|
@@ -45,64 +45,41 @@ distclean: clean.local
|
|
|
|
# BB If install is not run by root but OCSIGENUSER, OCSIGENGROUP is somebody
|
|
# BB different, make files universally accessible, we cannot chown.
|
|
-INSTALL_CAN_PUT_PERMISSIONS=yes
|
|
-INSTALL_USER_GROUP=-o $(OCSIGENUSER) -g "$(OCSIGENGROUP)"
|
|
-INSTALL_MOD_660=660
|
|
-INSTALL_MOD_644=644
|
|
-INSTALL_MOD_755=755
|
|
-INSTALL_MOD_770=770
|
|
-INSTALL_MOD_750=750
|
|
-USERNAME=$(shell whoami)
|
|
-ifneq ($(shell id -u), 0)
|
|
- ifneq ($(OCSIGENUSER), $(USERNAME))
|
|
- INSTALL_CAN_PUT_PERMISSIONS=no
|
|
- endif
|
|
- ifneq ($(shell groups ${USERNAME}|grep -q ${OCSIGENGROUP}; echo $$?), 0)
|
|
- INSTALL_CAN_PUT_PERMISSIONS=no
|
|
- endif
|
|
-endif
|
|
-ifeq ($(INSTALL_CAN_PUT_PERMISSIONS), no)
|
|
- INSTALL_USER_GROUP=
|
|
- INSTALL_MOD_660=666
|
|
- INSTALL_MOD_644=666
|
|
- INSTALL_MOD_755=777
|
|
- INSTALL_MOD_770=777
|
|
- INSTALL_MOD_750=777
|
|
-endif
|
|
+INSTALL_CAN_PUT_PERMISSIONS=no
|
|
|
|
install.files:
|
|
@echo
|
|
@echo "## Run \"make doc\" and \"make install.doc\" to build and install the ocamldoc."
|
|
@echo INSTALL_CAN_PUT_PERMISSIONS: ${INSTALL_CAN_PUT_PERMISSIONS}
|
|
## Command pipe
|
|
- $(INSTALL) -m ${INSTALL_MOD_755} -d $(dir $(TEMPROOT)$(COMMANDPIPE))
|
|
+ $(BSD_INSTALL_DATA_DIR) -d $(dir $(TEMPROOT)$(COMMANDPIPE))
|
|
[ -p $(TEMPROOT)$(COMMANDPIPE) ] || \
|
|
{ mkfifo -m ${INSTALL_MOD_660} $(TEMPROOT)$(COMMANDPIPE); \
|
|
if [ "${INSTALL_CAN_PUT_PERMISSIONS}" = yes ]; \
|
|
then $(CHOWN) -R $(OCSIGENUSER):"$(OCSIGENGROUP)" $(TEMPROOT)$(COMMANDPIPE); \
|
|
fi; }
|
|
## Configuration files
|
|
- $(INSTALL) -m ${INSTALL_MOD_755} -d $(TEMPROOT)$(CONFIGDIR)/conf.d
|
|
- ${INSTALL} -m ${INSTALL_MOD_644} ocsigenserver.conf.sample $(TEMPROOT)$(CONFIGDIR)/
|
|
+ $(BSD_INSTALL_DATA_DIR) -d $(TEMPROOT)$(CONFIGDIR)/conf.d
|
|
+ $(BSD_INSTALL_DATA) ocsigenserver.conf.sample $(TEMPROOT)$(CONFIGDIR)/
|
|
[ -f $(TEMPROOT)$(CONFIGDIR)/ocsigenserver.conf ] || \
|
|
- { $(INSTALL) -m ${INSTALL_MOD_644} ocsigenserver.conf.sample \
|
|
+ { $(BSD_INSTALL_DATA) ocsigenserver.conf.sample \
|
|
$(TEMPROOT)$(CONFIGDIR)/ocsigenserver.conf; }
|
|
- -mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old
|
|
+# -mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old
|
|
## Log directory
|
|
- $(INSTALL) -m ${INSTALL_MOD_644} src/files/mime.types $(TEMPROOT)$(CONFIGDIR)
|
|
- $(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} $(TEMPROOT)$(LOGDIR)
|
|
+ $(BSD_INSTALL_DATA) src/files/mime.types $(TEMPROOT)$(CONFIGDIR)
|
|
+ $(BSD_INSTALL_DATA_DIR) $(TEMPROOT)$(LOGDIR)
|
|
## Static files
|
|
- $(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} $(TEMPROOT)$(STATICPAGESDIR)
|
|
- $(INSTALL) -d -m ${INSTALL_MOD_750} ${INSTALL_USER_GROUP} $(TEMPROOT)$(DATADIR)
|
|
- $(INSTALL) -m ${INSTALL_MOD_644} ${INSTALL_USER_GROUP} \
|
|
+ $(BSD_INSTALL_DATA_DIR) $(TEMPROOT)$(STATICPAGESDIR)
|
|
+ $(BSD_INSTALL_DATA_DIR) $(TEMPROOT)$(DATADIR)
|
|
+ $(BSD_INSTALL_DATA) \
|
|
local/var/www/*.html $(TEMPROOT)$(STATICPAGESDIR)
|
|
- $(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} \
|
|
+ $(BSD_INSTALL_DATA_DIR) \
|
|
$(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff
|
|
- $(INSTALL) -m ${INSTALL_MOD_644} ${INSTALL_USER_GROUP} \
|
|
+ $(BSD_INSTALL_DATA) \
|
|
local/var/www/ocsigenstuff/*.png local/var/www/ocsigenstuff/*.css \
|
|
$(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff
|
|
- $(INSTALL) -d -m ${INSTALL_MOD_755} $(TEMPROOT)$(MANDIR)
|
|
- $(INSTALL) -m ${INSTALL_MOD_644} src/files/ocsigenserver.1 $(TEMPROOT)$(MANDIR)
|
|
+ $(BSD_INSTALL_MAN_DIR) $(TEMPROOT)$(MANDIR)
|
|
+ $(BSD_INSTALL_MAN) src/files/ocsigenserver.1 $(TEMPROOT)$(MANDIR)
|
|
|
|
uninstall:
|
|
-make -C doc uninstall
|