summaryrefslogtreecommitdiff
path: root/www/ocsigen/files/patch-Makefile
blob: 2858690086f92ce801c6b3a81b444ed30da6b3d2 (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
--- Makefile.orig	2008-07-01 13:50:21.000000000 +0200
+++ Makefile	2008-07-08 11:25:25.000000000 +0200
@@ -284,7 +284,6 @@
 
 installnodoc: partialinstall
 	mkdir -p $(TEMPROOT)$(CONFIGDIR)
-	mkdir -p $(TEMPROOT)$(CONFIGDIR)/conf.d
 	mkdir -p $(TEMPROOT)$(STATICPAGESDIR)
 	mkdir -p $(TEMPROOT)$(STATICPAGESDIR)/miniwiki
 	mkdir -p $(TEMPROOT)$(STATICPAGESDIR)/tutorial
@@ -295,7 +294,6 @@
 	[ -p $(TEMPROOT)$(COMMANDPIPE) ] || { mkfifo $(TEMPROOT)$(COMMANDPIPE); \
 	  chmod 660 $(TEMPROOT)$(COMMANDPIPE); \
 	  $(CHOWN) -R $(OCSIGENUSER):$(OCSIGENGROUP) $(TEMPROOT)$(COMMANDPIPE);}
-#	-mv $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.old
 	cat files/ocsigen.conf.in \
 	| sed s%_LOGDIR_%$(LOGDIR)%g \
 	| sed s%_STATICPAGESDIR_%$(STATICPAGESDIR)%g \
@@ -318,21 +316,10 @@
 	| sed s%[.]cmo%.cmxs%g \
 	| sed s%[.]cma%.cmxs%g \
 	> $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.opt.sample
-	-mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old
 	cp -f files/mime.types $(TEMPROOT)$(CONFIGDIR)
 	mkdir -p $(TEMPROOT)$(LOGDIR)
 	chmod u+rwx $(TEMPROOT)$(LOGDIR)
-	chmod a+rx $(TEMPROOT)$(CONFIGDIR)
-	chmod a+rx $(TEMPROOT)$(CONFIGDIR)/conf.d
-	[ -f $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf ] || \
-	{ cp $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.sample \
-             $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf; \
-	  chmod a+r $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf; }
 	chmod a+r $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.sample
-	[ -f $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf ] || \
-	{ cp $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.opt.sample \
-             $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.opt; \
-	  chmod a+r $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.opt; }
 	chmod a+r $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.opt.sample
 	chmod a+r $(TEMPROOT)$(CONFIGDIR)/mime.types
 	$(INSTALL) -m 644 files/tutorial/style.css $(TEMPROOT)$(STATICPAGESDIR)/tutorial