summaryrefslogtreecommitdiffstats
path: root/network/havp/patches/put_templates_in_usrshare.diff
blob: 5bf54cfa29e777361d8f5bce0d80d7d30aa5aa44 (plain)
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
Use @datadir@/havp/ (e.g. /usr/share/havp) instead of 
@sysconfdir@/havp (e.g. /etc/havp) for the templates 
(use for error messages and such)

diff -Nur havp-0.92a.orig/etc/havp/havp.config.in havp-0.92a/etc/havp/havp.config.in
--- havp-0.92a.orig/etc/havp/havp.config.in	2011-12-20 22:00:20.651052966 -0600
+++ havp-0.92a/etc/havp/havp.config.in	2011-12-20 22:00:06.253243044 -0600
@@ -203,7 +203,7 @@
 # Path to template files.
 #
 # Default:
-# TEMPLATEPATH @sysconfdir@/havp/templates/en
+TEMPLATEPATH @datadir@/havp/templates/en
 
 #
 # Set to true if you want to prefer Whitelist.
diff -Nur havp-0.92a.orig/havp/Makefile.in havp-0.92a/havp/Makefile.in
--- havp-0.92a.orig/havp/Makefile.in	2011-12-20 21:59:41.434570700 -0600
+++ havp-0.92a/havp/Makefile.in	2011-12-20 22:02:28.130369990 -0600
@@ -9,6 +9,7 @@
 sbindir = @sbindir@
 sysconfdir = @sysconfdir@
 localstatedir = @localstatedir@
+datadir = @datadir@
 
 OBJECTS = helper.o logfile.o scannerhandler.o connectiontobrowser.o \
           genericscanner.o httphandler.o params.o sockethandler.o \
@@ -29,6 +30,7 @@
 	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/log/havp
 	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/tmp/havp
 	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/run/havp
+	$(INSTALL) -d -m 755 $(DESTDIR)$(datadir)/havp
 	$(INSTALL) -d $(DESTDIR)/etc/rc.d
 	$(INSTALL) -m 755 ../etc/init.d/havp $(DESTDIR)/etc/rc.d/rc.havp.new
 	$(INSTALL) -m 644 ../etc/havp/havp.config $(DESTDIR)$(sysconfdir)/havp/havp.config.default
@@ -49,8 +51,8 @@
 	else \
 		echo "Not overwriting old $(DESTDIR)$(sysconfdir)/havp/blacklist"; \
 	fi
-	cp -r ../etc/havp/templates $(DESTDIR)$(sysconfdir)/havp/
-	chmod -R a+rX $(DESTDIR)$(sysconfdir)/havp/templates
+	cp -r ../etc/havp/templates $(DESTDIR)$(datadir)/havp/
+	chmod -R a+rX $(DESTDIR)$(datadir)/havp/templates
 
 clean:
 	cd scanners && $(MAKE) clean