From 3c03f5572c03f41c268ec045bbd4a4d39afb80b1 Mon Sep 17 00:00:00 2001
Message-Id: <3c03f5572c03f41c268ec045bbd4a4d39afb80b1.1714394413.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 25 May 2008 20:35:45 +0100
Subject: [PATCH] Catch up with new CGI location
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 README             | 2 +-
 cgi/disorder-cgi.h | 2 +-
 debian/rules       | 2 +-
 scripts/inst       | 4 ++--
 scripts/setup.in   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README b/README
index 27657db..d13ab37 100644
--- a/README
+++ b/README
@@ -235,7 +235,7 @@ You need to configure a number of things to make this work:
 4. Install disorder.cgi in an appropriate location.  Remember to make it
    executable.  Example:
 
-     install -m 755 server/disorder.cgi /usr/lib/cgi-bin/disorder
+     install -m 755 cgi/disorder.cgi /usr/lib/cgi-bin/disorder
 
 5. Try it out.  You should be able to perform read-only operations straight
    away, and after visiting the 'Login' page to authenticate, perform other
diff --git a/cgi/disorder-cgi.h b/cgi/disorder-cgi.h
index 73a761d..3f19fe2 100644
--- a/cgi/disorder-cgi.h
+++ b/cgi/disorder-cgi.h
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-/** @file server/disorder-cgi.h
+/** @file cgi/disorder-cgi.h
  * @brief Shared header for DisOrder CGI program
  */
 
diff --git a/debian/rules b/debian/rules
index 20c38ca..6c5b0ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -152,7 +152,7 @@ pkg-disorder-server: build
 		debian/disorder-server/etc/disorder/options
 	$(INSTALL_DATA) debian/etc.disorder.options.user \
 		debian/disorder-server/etc/disorder/options.user
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) server/disorder.cgi \
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cgi/disorder.cgi \
 		$(shell pwd)/debian/disorder-server/usr/lib/cgi-bin/disorder
 	dpkg-shlibdeps -Tdebian/substvars.disorder-server \
 		debian/disorder-server/usr/lib/cgi-bin/disorder \
diff --git a/scripts/inst b/scripts/inst
index 790037c..e75db11 100755
--- a/scripts/inst
+++ b/scripts/inst
@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# Copyright (C) 2004-2008x Richard Kettlewell
+# Copyright (C) 2004-2008 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,5 +24,5 @@ set -x
 make "$@"
 #make check
 really make "$@" install
-really install -m 755 server/disorder.cgi /home/jukebox/public_html/index.cgi
+really install -m 755 cgi/disorder.cgi /home/jukebox/public_html/index.cgi
 really ldconfig
diff --git a/scripts/setup.in b/scripts/setup.in
index 3bc0b45..541949e 100755
--- a/scripts/setup.in
+++ b/scripts/setup.in
@@ -536,7 +536,7 @@ if [ -z "$CGIBIN" ]; then
   echo "Cannot find your web server's cgi-bin directory"
 else
   echo "Installing CGI in $CGIBIN"
-  install -m 555 server/disorder.cgi $CGIBIN/disorder
+  install -m 555 cgi/disorder.cgi $CGIBIN/disorder
 fi
 
 if $server_running; then
-- 
[mdw]