* techdoc/binaries.txt : updated, now includes WebCit instructions

* setup.c: detect when setup is run from within the Citadel/UX Ridiculously
  Easy Installer and skip the directory prompt; the installer sets it.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 4e50d0c47e02bde8dac6c3a7650ae038e8dec906..5fb06fc0da47f86fbe3587f4509c50b17d7c6261 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,9 @@
  $Log$
+ Revision 620.19  2004/04/20 02:42:54  ajc
+ * techdoc/binaries.txt : updated, now includes WebCit instructions
+ * setup.c: detect when setup is run from within the Citadel/UX Ridiculously
+   Easy Installer and skip the directory prompt; the installer sets it.
+
  Revision 620.18  2004/04/14 18:43:51  nbryant
  * citadel.spec: BuildRequire redhat-rpm-config
 
@@ -5703,4 +5708,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/setup.c b/citadel/setup.c
index b69e06334fbcf51e723d2828b3e1be00a2ed02c2..88b9d352231a152847027a029955ec7a034cd7d3 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -44,6 +44,7 @@
 int setup_type;
 char setup_directory[SIZ];
 char init_entry[SIZ];
+int using_web_installer = 0;
 
 char *setup_titles[] =
 {
@@ -776,6 +777,11 @@ int main(int argc, char *argv[])
        /* set an invalid setup type */
        setup_type = (-1);
 
+        /* Check to see if we're running the web installer */
+       if (getenv("CITADEL_INSTALLER") != NULL) {
+               using_web_installer = 1;
+       }
+
        /* parse command line args */
        for (a = 0; a < argc; ++a) {
                if (!strncmp(argv[a], "-u", 2)) {
@@ -805,7 +811,13 @@ int main(int argc, char *argv[])
 
        /* Get started in a valid setup directory. */
        strcpy(setup_directory, BBSDIR);
-       set_str_val(0, setup_directory);
+       if ( (using_web_installer) && (getenv("CITADEL") != NULL) ) {
+               strcpy(setup_directory, getenv("CITADEL"));
+       }
+       else {
+               set_str_val(0, setup_directory);
+       }
+
        if (chdir(setup_directory) != 0) {
                important_message("Citadel/UX Setup",
                          "The directory you specified does not exist.");

diff --git a/citadel/techdoc/binaries.txt b/citadel/techdoc/binaries.txt
index 51d72d92b218445e2a20a6ec3cba39513df3ce97..db89fcf5ec773f26c8ca9e1869e610ac62459e92 100644 (file)
--- a/citadel/techdoc/binaries.txt
+++ b/citadel/techdoc/binaries.txt
@@ -23,30 +23,35 @@ We build in /usr/src.
  
  (FIXME still not detected properly)
 
-3. If LDAP support is required, build OpenLDAP with:
-
+3. Set these environment variables for the rest of the build:
 export CFLAGS='-I/usr/local/ctdlsupport/include'
 export CPPFLAGS='-I/usr/local/ctdlsupport/include'
 export LDFLAGS='-L/usr/local/ctdlsupport/lib -Wl,--rpath -Wl,/usr/local/ctdlsupport/lib'
+ 
+ -L tells the build system where to find libraries during the build process,
+while -Wl,--rpath inserts that same library path into the Citadel binaries
+so they know where to find the libs at runtime.  Since we can't depend on
+the correct version of Berkeley DB already being on the system, this is how
+we carry our own along.  It's better than static linking everything.
+
+4. If LDAP support is required, build OpenLDAP with:
+
 ./configure --prefix=/usr/local/citadel --with-db=/usr/local/ctdlsupport
 make
 make depend
 make install
 
-4. Build Citadel with:
+5. Build Citadel with:
 
-export CFLAGS='-I/usr/local/ctdlsupport/include'
-export LDFLAGS='-L/usr/local/ctdlsupport/lib -Wl,--rpath -Wl,/usr/local/ctdlsupport/lib'
 ./configure --prefix=/usr/local/citadel --with-db=/usr/local/ctdlsupport
 make
 make install
- 
- -L tells the build system where to find libraries during the build process,
-while -Wl,--rpath inserts that same library path into the Citadel binaries
-so they know where to find the libs at runtime.  Since we can't depend on
-the correct version of Berkeley DB already being on the system, this is how
-we carry our own along.  It's better than static linking everything.
- 
+
+6. Build WebCit with:
+
+./configure --prefix=/usr/local/webcit
+make
+make install
  
  FIXME / TODO