From 8cd6e1d29758aa35bfd6ad2c05d6c45c4a6a3ea8 Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Mon, 3 Nov 2003 12:26:58 +0000 Subject: [PATCH] Two html pages under control of configure --- ChangeLog | 1 + configure | 4 +++- configure.in | 2 ++ html/Makefile | 11 ++++++++--- html/{basic.html => basic.html.in} | 18 +++++++++--------- html/{index.htm => index.htm.in} | 2 +- 6 files changed, 24 insertions(+), 14 deletions(-) rename html/{basic.html => basic.html.in} (96%) mode change 100755 => 100644 rename html/{index.htm => index.htm.in} (98%) mode change 100755 => 100644 diff --git a/ChangeLog b/ChangeLog index 04a064b3..6ea40e7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ v0.39.1 22-Oct-2003 general: Make dist now creates bzip2 archives. + Two html pages are now under control of configure. upgrade: If you don't have any personal archivers, then remove diff --git a/configure b/configure index d3cc1626..ceec72ef 100755 --- a/configure +++ b/configure @@ -8893,7 +8893,7 @@ echo "${ECHO_T}$vpop" >&6 done - ac_config_files="$ac_config_files Makefile.global paths.h unix/login.defs INSTALL FILE_ID.DIZ script/editor" + ac_config_files="$ac_config_files Makefile.global paths.h unix/login.defs INSTALL FILE_ID.DIZ script/editor html/index.htm html/basic.html" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -9433,6 +9433,8 @@ do "INSTALL" ) CONFIG_FILES="$CONFIG_FILES INSTALL" ;; "FILE_ID.DIZ" ) CONFIG_FILES="$CONFIG_FILES FILE_ID.DIZ" ;; "script/editor" ) CONFIG_FILES="$CONFIG_FILES script/editor" ;; + "html/index.htm" ) CONFIG_FILES="$CONFIG_FILES html/index.htm" ;; + "html/basic.html" ) CONFIG_FILES="$CONFIG_FILES html/basic.html" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 diff --git a/configure.in b/configure.in index 1f3193d1..7e73908b 100644 --- a/configure.in +++ b/configure.in @@ -273,6 +273,8 @@ AC_OUTPUT( INSTALL FILE_ID.DIZ script/editor + html/index.htm + html/basic.html ) #================================================================================= diff --git a/html/Makefile b/html/Makefile index 326d8f48..a48692c0 100644 --- a/html/Makefile +++ b/html/Makefile @@ -4,8 +4,8 @@ include ../Makefile.global -H_BASE = basic.html dist.html manual.css \ - flow.html postfix.html index.htm ups.html \ +H_BASE = dist.html manual.css \ + flow.html postfix.html ups.html \ intergate.html intro.html invoking.html faq.html \ known_bugs.html mgetty.html routing.html nodelist.html @@ -83,7 +83,11 @@ H_SETUP = setup/archiver.html setup/index.htm setup/bbs.html \ setup/hatch.html setup/virscan.html setup/services.html \ setup/domains.html setup/taskmgr.html setup/route.html -FILES = $(H_BASE) $(H_FTSC) $(H_IMAGES) $(H_LICENSE) $(H_MENUS) $(H_MISC) $(H_PROGS) $(H_SETUP) Makefile +H_OTHER = index.htm basic.html + +H_IN = index.htm.in basic.html.in + +FILES = $(H_IN) $(H_BASE) $(H_FTSC) $(H_IMAGES) $(H_LICENSE) $(H_MENUS) $(H_MISC) $(H_PROGS) $(H_SETUP) Makefile ######################################################################################################### @@ -109,6 +113,7 @@ install: @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/programs @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/setup @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_BASE} ${PREFIX}/html + @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_OTHER} ${PREFIX}/html @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_FTSC} ${PREFIX}/html/ftsc @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_IMAGES} ${PREFIX}/html/images @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_LICENSE} ${PREFIX}/html/license diff --git a/html/basic.html b/html/basic.html.in old mode 100755 new mode 100644 similarity index 96% rename from html/basic.html rename to html/basic.html.in index c8ea71e3..419da87e --- a/html/basic.html +++ b/html/basic.html.in @@ -13,7 +13,7 @@
-
Last update 12-Jan-2003
+
Last update 03-Nov-2003

MBSE BBS Basic Installation

@@ -94,15 +94,15 @@ previous or failed installation on your system. If that's so the script will not run. In other words, you can only run this script once. The script makes backup copies of the system files it changes, these files will get the extension .mbse To run the installation script you need -the archive mbbsebbs-0.nn.nn.tar.gz. -Unpack this archive on your system, in /tmp will do fine: +the archive mbbsebbs-@VERSION@.tar.bz2. +Unpack this archive on your system, in /tmp: 
 cd /tmp
-tar xfvz /path/to/the/mbsebbs-0.nn.nn.tar.gz
+tar xfvj /path/to/the/mbsebbs-@VERSION@.tar.bz2
To start the script type: 
-cd mbsebbs-0.nn.nn
+cd mbsebbs-@VERSION@
 bash ./SETUP.sh
Yes, use bash as shell here. On some systems root doesn't use bash @@ -140,10 +140,10 @@ If something is wrong, now is the time to fix it. Don't panic and remember the backups of the system files that are changed are in /etc with the extension .mbse i.e: those were the original files. The installation logfile is copied to /opt/mbse. -If everythings is allright, then remove the directory /tmp/mbsebbs-0.nn.nn: +If everythings is allright, then remove the directory /tmp/mbsebbs-@VERSION@: 
 cd /tmp
-rm -Rf mbsebbs-0.nn.nn
+rm -Rf mbsebbs-@VERSION@

 

@@ -152,12 +152,12 @@ rm -Rf mbsebbs-0.nn.nn Login as user mbse. Yes, very important, login as user mbse. While in mbse's home directory (/opt/mbse) unpack the distribution archives: 

-tar xfvz /path/to/mbsebbs-0.nn.nn.tar.gz
+tar xfvz /path/to/mbsebbs-@VERSION@.tar.bz2
You now have the subdirectory with sources in the right place. Next build the binaries and install them using the folowing commands: 
-cd ~/mbsebbs-0.nn.nn
+cd ~/mbsebbs-@VERSION@
 ./configure
 make
 su        important, do not use "su -"
diff --git a/html/index.htm b/html/index.htm.in
old mode 100755
new mode 100644
similarity index 98%
rename from html/index.htm
rename to html/index.htm.in
index f471b9fd..8384592f
--- a/html/index.htm
+++ b/html/index.htm.in
@@ -13,7 +13,7 @@
 
 

 

-
MBSE BBS System Guide v0.39.0

+
MBSE BBS System Guide @VERSION@

 
Last update 11-Oct-2003