blob: 55d838d5dce7209c0fbe07238b1887b93e4639ee (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
--- Makefile.orig 2012-12-07 16:17:09.000000000 +0100
+++ Makefile
@@ -67,61 +67,33 @@
# 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_CAN_PUT_PERMISSIONS=no
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
-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.files:
@echo INSTALL_CAN_PUT_PERMISSIONS: ${INSTALL_CAN_PUT_PERMISSIONS}
- ## Command pipe
- $(INSTALL) -m ${INSTALL_MOD_755} -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} ${PROJECTNAME}.conf.sample $(TEMPROOT)$(CONFIGDIR)/
- [ -f $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf ] || \
- { $(INSTALL) -m ${INSTALL_MOD_644} $(PROJECTNAME).conf.sample \
- $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf; }
+ ${BSD_INSTALL_DATA} ${PROJECTNAME}.conf.sample $(TEMPROOT)$(CONFIGDIR)/
-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)
## 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) -d $(TEMPROOT)$(STATICPAGESDIR)
+ $(BSD_INSTALL_DATA) -d $(TEMPROOT)$(DATADIR)
+ $(BSD_INSTALL_DATA) \
local/var/www/*.html $(TEMPROOT)$(STATICPAGESDIR)
- $(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} \
+ $(BSD_INSTALL_DATA) -d \
$(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/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR)
+ $(BSD_INSTALL_MAN) -d $(TEMPROOT)$(MANDIR)
+ $(BSD_INSTALL_MAN) src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR)
uninstall:
-make -C doc uninstall
|
