From 80f5efa2ab47f333cfb44714638cd964cf86c846 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Tue, 20 Apr 2004 02:02:50 +0000
Subject: [PATCH] * "make install"

---
 webcit/ChangeLog    |  4 +++-
 webcit/Makefile.in  | 11 ++++++++++-
 webcit/README.txt   | 22 +++++++++++-----------
 webcit/configure.in |  2 ++
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 78ed65138..69f2ab946 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 506.6  2004/04/20 02:02:50  ajc
+* "make install"
+
 Revision 506.5  2004/04/16 03:14:06  ajc
 * Minor fix for previous checkin
 
@@ -1773,4 +1776,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* webserver.c: warning fix
-
diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index e8b305014..7eca4f942 100644
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -4,12 +4,14 @@ AUTOCONF=@AUTOCONF@
 CC=@CC@
 CFLAGS=@CFLAGS@
 DEFS=@DEFS@
+INSTALL=@INSTALL@
 LIBOBJS=@LIBOBJS@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@
 SETUP_LIBS=@SETUP_LIBS@
 PTHREAD_DEFS=@PTHREAD_DEFS@
 srcdir=@srcdir@
+prefix=@prefix@
 
 # End of configuration section
 
@@ -46,7 +48,7 @@ webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
 	$(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
 
 .c.o:
-	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"`pwd`\" $<
+	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" $<
 
 Makefile: $(srcdir)/Makefile.in config.status
 	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
@@ -56,3 +58,10 @@ config.status: $(srcdir)/configure
 
 $(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4
 	cd $(srcdir) && $(AUTOCONF)
+
+install:
+	test -d $(root)$(prefix) || mkdir $(root)$(prefix)
+	test -d $(root)$(prefix)/static || mkdir $(root)$(prefix)/static
+	for i in webserver setup `find static -type f | grep -v CVS` ; do \
+		$(INSTALL) $$i $(root)$(prefix)/$$i; \
+	done
diff --git a/webcit/README.txt b/webcit/README.txt
index fc445a8f5..7ade27983 100644
--- a/webcit/README.txt
+++ b/webcit/README.txt
@@ -38,22 +38,20 @@ or some other web server listening on port 80, you must run WebCit on another
 port.  The default is port 2000.
  
  To compile from source, enter the usual commands:
-  ./configure
+  ./configure --prefix=/usr/local/webcit   [or whatever directory you prefer]
   make
+  make install
  
- Then to test it, simply run the webserver:
-  ./webserver
+ Then to initialize it:
+  cd /usr/local/webcit
+  ./setup
  
- You'll see a bunch of diagnostic messages on the screen.  At this time you
-can try it out.  Point your web browser to WebCit using a URL such as:
+ After running setup, you just point your web browser to whatever port you
+specified, such as:
  
   http://your.host.name:2000
  
- ...and log in.  When you're satisfied that the program is working the way you
-want it to, you should set it up to be automatically started by the system at
-boot time.  The recommended way to do this is with an entry in /etc/inittab,
-because init can then automatically restart WebCit if it happens to crash for
-any reason.
+ ...and log in.
  
  The included "setup" program is basically just an installation helper that
 asks a series of questions and then adds the appropriate line to inittab to
@@ -79,7 +77,9 @@ the "webserver" program:
   -> localport: the TCP port on which you wish your WebCit server to run.
      this can be any port number at all; there is no standard.  Naturally,
      you'll want to create a link to this port on your system's regular web
-     pages (presumably on an Apache server running on port 80).
+     pages (presumably on an Apache server running on port 80).  Or, if you
+     are installing WebCit on a dedicated server, then you might choose to
+     use port 80 after all.
  
   -> tracefile: where you want WebCit to log to.  This can be a file, a
      virtual console, or /dev/null to suppress logging altogether.
diff --git a/webcit/configure.in b/webcit/configure.in
index b974dd231..42955013b 100644
--- a/webcit/configure.in
+++ b/webcit/configure.in
@@ -3,6 +3,8 @@ dnl $Id$
 AC_INIT(webserver.c)
 
 AC_CANONICAL_HOST
+AC_PROG_INSTALL
+AC_PREFIX_DEFAULT(/usr/local/webcit)
 
 AC_ARG_WITH(with_libical, [  --with-libical          use libical calendaring library])
 AC_ARG_WITH(with_newt, [  --with-newt          use newt window library])
-- 
2.39.2