From 0f32341ead4f1534270a82c4372d84a1aaa9b0cd Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 24 Feb 2014 14:22:29 +0100
Subject: we have no static content, so install to /usr/lib/cqrlogo

---
 Makefile             | 5 +++--
 README.md            | 2 +-
 config/apache.conf   | 8 ++++----
 config/lighttpd.conf | 6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 19c5969..9e29586 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # cqrlogo - CGI QR-Code logo for web services
 
 PREFIX	:= /usr
+LIBDIR	:= $(PREFIX)/lib
 APACHECONF	:= /etc/apache/conf/extra/
 LIGHTTPDCONF	:= /etc/lighttpd/conf.d/
 CC	:= gcc
@@ -48,8 +49,8 @@ cqrlogo.png: cqrlogo.cgi
 install: install-bin install-config install-doc
 
 install-bin: cqrlogo.cgi cqrlogo.fcgi
-	$(INSTALL) -D -m0755 cqrlogo.cgi $(DESTDIR)$(PREFIX)/share/webapps/cqrlogo/cqrlogo.cgi
-	$(INSTALL) -D -m0755 cqrlogo.fcgi $(DESTDIR)$(PREFIX)/share/webapps/cqrlogo/cqrlogo.fcgi
+	$(INSTALL) -D -m0755 cqrlogo.cgi $(DESTDIR)$(LIBDIR)/cqrlogo/cqrlogo.cgi
+	$(INSTALL) -D -m0755 cqrlogo.fcgi $(DESTDIR)$(LIBDIR)/cqrlogo/cqrlogo.fcgi
 	$(INSTALL) -D -m0644 cqrlogo.conf $(DESTDIR)/etc/cqrlogo.conf
 
 install-config: config/apache.conf config/lighttpd.conf
diff --git a/README.md b/README.md
index dd9fa9a..ae794d5 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ followed by:
 
 > make install
 
-This will place an executable at `/usr/share/webapps/cqrlogo/cqrlogo`,
+This will place an executable at `/usr/lib/cqrlogo/cqrlogo`,
 documentation can be found in `/usr/share/doc/cqrlogo/`.
 
 The file `config.h` (copy from `config.def.h` if it does not exist) provides
diff --git a/config/apache.conf b/config/apache.conf
index 61eff91..4854335 100644
--- a/config/apache.conf
+++ b/config/apache.conf
@@ -7,25 +7,25 @@
 	# try fastcgi first
 	<IfModule fastcgi_module>
 		AddHandler fastcgi-script fcgi
-		ScriptAlias /cqrlogo "/usr/share/webapps/cqrlogo/cqrlogo.fcgi"
+		ScriptAlias /cqrlogo "/usr/lib/cqrlogo/cqrlogo.fcgi"
 	</IfModule>
 
 	# then use fcgid
 	<IfModule !fastcgi_module>
 		<IfModule fcgid_module>
 			AddHandler fcgid-script fcgi
-			ScriptAlias /cqrlogo "/usr/share/webapps/cqrlogo/cqrlogo.fcgi"
+			ScriptAlias /cqrlogo "/usr/lib/cqrlogo/cqrlogo.fcgi"
 		</IfModule>
 	</IfModule>
 
 	# and fall back to simple CGI if fastcgi modules above fail
 	<IfModule !fastcgi_module>
 		<IfModule !fcgid_module>
-			ScriptAlias /cqrlogo "/usr/share/webapps/cqrlogo/cqrlogo.cgi"
+			ScriptAlias /cqrlogo "/usr/lib/cqrlogo/cqrlogo.cgi"
 		</IfModule>
 	</IfModule>
 
-	<Directory /usr/share/webapps/cqrlogo/>
+	<Directory /usr/lib/cqrlogo/>
 		Options ExecCGI
 		Allow from all
 	</Directory>
diff --git a/config/lighttpd.conf b/config/lighttpd.conf
index a697d8a..e69be48 100644
--- a/config/lighttpd.conf
+++ b/config/lighttpd.conf
@@ -8,15 +8,15 @@
 server.modules += ( "mod_alias", "mod_fastcgi" )
 #server.modules += ( "mod_alias", "mod_cgi" )
 
-alias.url += ( "/cqrlogo" => "/usr/share/webapps/cqrlogo/cqrlogo.fcgi" )
-#alias.url += ( "/cqrlogo" => "/usr/share/webapps/cqrlogo/cqrlogo.fcgi" )
+alias.url += ( "/cqrlogo" => "/usr/lib/cqrlogo/cqrlogo.fcgi" )
+#alias.url += ( "/cqrlogo" => "/usr/lib/cqrlogo/cqrlogo.fcgi" )
 
 fastcgi.server = (
 	".fcgi" => (
 		"localhost" => (
 			"max-procs" => 1,
 			"socket" => "/run/lighttpd/cqrlogo-fastcgi.sock",
-			"bin-path" => "/usr/share/webapps/cqrlogo/cqrlogo.fcgi"
+			"bin-path" => "/usr/lib/cqrlogo/cqrlogo.fcgi"
 		)
 	)
 )
-- 
cgit v1.2.3-70-g09d2