From 8e64159e860836088282c73f23307aa1bb17baaa Mon Sep 17 00:00:00 2001
From: skywalker <skywalker@users.sourceforge.net>
Date: Wed, 15 Aug 2001 05:37:55 +0000
Subject: [PATCH] Fix some simple void main() declarations, and the clean
 directive

---
 src/install/classic/CSTarInstall.sh | 8 ++++----
 src/make.new/Makefile.in.firebird   | 7 +++++--
 src/msgs/change_msgs.epp            | 2 +-
 src/msgs/enter_msgs.epp             | 2 +-
 src/msgs/modify_msgs.epp            | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/install/classic/CSTarInstall.sh b/src/install/classic/CSTarInstall.sh
index 07218c607f..c06da78bdb 100755
--- a/src/install/classic/CSTarInstall.sh
+++ b/src/install/classic/CSTarInstall.sh
@@ -85,9 +85,9 @@ checkInstallUser
 
 # Ok, here we are installing from a CVS tree
 
-if [ -e firebird ]
+if [ -e gen ]
   then
-    ScriptsSrcDir=./src/install/linux
+    ScriptsSrcDir=./src/install/
 
     ( $ScriptsSrcDir/classic/CSpreinstall.sh )
 
@@ -101,13 +101,13 @@ fi
 if [ -e scripts ]
   then
     echo "Extracting install data"
-    runAndCheckExit "tar -xzf interbase.tar.gz"
+    runAndCheckExit "tar -xzf firebird.tar.gz"
 
     (./scripts/CSpreinstall.sh)
     (./scripts/CSinstall.sh)
     (./scripts/CSpostinstall.sh)
 
-    rm -rf interbase
+    rm -rf firebird
 fi
 
 echo "Install completed"
diff --git a/src/make.new/Makefile.in.firebird b/src/make.new/Makefile.in.firebird
index cc6746c610..7bd2887eba 100644
--- a/src/make.new/Makefile.in.firebird
+++ b/src/make.new/Makefile.in.firebird
@@ -26,7 +26,7 @@
 #   Contributor(s):
 # 
 # 
-#   $Id: Makefile.in.firebird,v 1.5 2001-08-13 08:14:38 skywalker Exp $
+#   $Id: Makefile.in.firebird,v 1.6 2001-08-15 05:37:55 skywalker Exp $
 # 
 
 ROOT=..
@@ -379,7 +379,7 @@ builddist:
 #___________________________________________________________________________
 # This one needs some more work.
 
-clean: clean_objs clean_libs clean_exes clean_dbs
+clean: clean_objs clean_libs clean_exes clean_dbs clean_build
 
 clean_objs:
 	-echo $(GDSLIB_Objects) | xargs rm -f
@@ -402,6 +402,9 @@ clean_dbs:
 	-rm */*\.gdb
 	-rm */*\.lnk
 
+clean_build:
+	-rm -rf $(GEN_ROOT)/firebird
+
 #	rm -f $(GDSLIB_OBJECTS) $(GDSLIB_PHASE3_OBJECTS)
 
 
diff --git a/src/msgs/change_msgs.epp b/src/msgs/change_msgs.epp
index ccd045ea50..7f4ac3f4e3 100644
--- a/src/msgs/change_msgs.epp
+++ b/src/msgs/change_msgs.epp
@@ -51,7 +51,7 @@ static SSHORT mustget(SCHAR *);
 static int translate(SCHAR *, SCHAR *, SSHORT);
 
 
-void main( int argc, char **argv)
+int main( int argc, char **argv)
 {
 /**************************************
  *
diff --git a/src/msgs/enter_msgs.epp b/src/msgs/enter_msgs.epp
index b50424dbdf..faf81f6ce0 100644
--- a/src/msgs/enter_msgs.epp
+++ b/src/msgs/enter_msgs.epp
@@ -56,7 +56,7 @@ static int get_symbol( UCHAR *);
 #define UPPER_Z		'Z'
 
 
-void main( int argc, char **argv)
+int main( int argc, char **argv)
 {
 /**************************************
  *
diff --git a/src/msgs/modify_msgs.epp b/src/msgs/modify_msgs.epp
index e539df9682..a6a6974162 100644
--- a/src/msgs/modify_msgs.epp
+++ b/src/msgs/modify_msgs.epp
@@ -33,7 +33,7 @@ DATABASE DB = "msg.gdb";
 static int explicit_print(TEXT *);
 
 
-void main( int argc, char **argv)
+int main( int argc, char **argv)
 {
 /**************************************
  *