Catch up with new CGI location

diff --git a/README b/README
index 27657dbd0ffc64b05f7db80d589e2d33722fbb56..d13ab376ce68a249af0211b3ce0fd34eea0ca66d 100644 (file)
--- 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 73a761df382152e1bb39ed56628bfc451c1da138..3f19fe2cd6f5c89576ec0f9a3680206dbf36cf92 100644 (file)
--- 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 20c38ca2f8c21e5e6de1742fe33de05fcb53dea0..6c5b0ac9df683f7b19085728c5fae48b97c01d10 100755 (executable)
--- 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 790037c03a45c15d4ddedc18ad13112a4c81ba3e..e75db113760ea3584a90684e7c4e9be3e1fca76e 100755 (executable)
--- 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 3bc0b45ae8d3b56b79b885abee76ba58ab499c12..541949ecb6c9cc7a6a9a0a91d5d001f78ed96692 100755 (executable)
--- 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