Check GNUSTEP_FLATTENED when setting bindir, etec

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@10029 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,10 @@
+2001-05-28  Adam Fedor  <fedor@gnu.org>
+
+	* config.site: Check GNUSTEP_FLATTENED when setting bindir,libdir.
+
+	* Documentation/README.MinGW: Update
+	* Documentation/news.texi: Likewise.
+
 2001-05-18  Mirko Viviani  <mirko.viviani@rccr.cremona.it>
 
 	* framework.make ($(DUMMY_FRAMEWORK_FILE)): added missed fi.

Documentation/README.MinGW

@@ -9,6 +9,15 @@ subtle problems with running GNU tools on Windows, so any problems you
 may encounter may just as easly have to do with the compilation tools
 you are using as with GNUstep.
 
+The base library is not completely ported to run on MinGW yet.
+In particular, anything using sockets, RunLoops and FileHandles will probably
+not work.
+
+Note for compiling with shared libraries (DLLs), it's a good idea to
+remove the libobjc.a that comes with gcc (gcc -v for location) so that
+it isn't accidentally found instead of the libobjc DLL that you will
+compile below.
+
 MinGW on Cygwin
 ---------------
 
@@ -77,13 +86,6 @@ variable to 'win32'. Then:
   /usr/bin/make target=i386-mingw32 shared=yes
   /usr/bin/make target=i386-mingw32 shared=yes install
 
-Note that the base library is not completely ported to run on MinGW yet.
-In particular, anything using sockets, RunLoops and FileHandles.
-Alos, the gnustep-base DLL doesn't seem to be set up correctly.
-To compile the gstep-base as a static library, use:
-
-  /usr/bin/make shared=no target=i386-mingw32
-
 If you get tired of typing  "target=i386-mingw32" all the time, then before
 you exec the GNUstep.sh script, just set the GNUSTEP_HOST:
 

Documentation/gnustep-howto.texi

@@ -351,7 +351,9 @@ environment variable (on Solaris, it's set to @file{/usr/openwin/lib/X11}).
 @node GNUstep deamons,  , DPS Information, Additional Installation
 @section GNUstep deamons
 
-Set up your system to execute some GNUstep deamons. If you don't do this, they will be started automatically when you run your  first GNUstep app:
+Set up your system to execute some GNUstep deamons. If you don't do
+this, they will be started automatically when you run your first GNUstep
+app:
 
 @itemize @bullet
 @item gdomap - Put this in a system startup file, like @file{/etc/rc.local} or @file{/etc/rc.d/rc.local} (customize for your system)

Documentation/install.texi

@@ -17,6 +17,8 @@ libraries, read the file GNUstep-HOWTO for more complete instructions on
 how to install the entire GNUstep package (including this package).
 GNUstep-HOWTO comes with this distribution.
 
+This should be the first GNUstep package you install.
+
 When you configure additional libraries, make sure you use the same
 configuration options as with gstep-make.
 

Documentation/machines.texi

@@ -562,7 +562,9 @@ gcc 2.95.3 (Cygwin release 1.1.8)
 
 @item Extra libs needed 
 Objective-C library DLL (@url{ftp://ftp.gnustep.org/pub/gnustep/libs})
-for shared libs. ffcall is not ported to cygwin so don't try to use it (some
+for shared libs. It's a good idea to remove the libobjc.a that comes with gcc
+(gcc -v for location) so that it isn't accidentally found.
+Ffcall is not ported to cygwin so don't try to use it (some
 invocation and DO stuff will not work).
 
 @item Special Instructions 

Documentation/news.texi

@@ -9,6 +9,17 @@
 
 The currently released version is @samp{@value{GNUSTEP-MAKE-VERSION}}.
 
+@section Changes in version @samp{1.0.1}
+
+@itemize @bullet
+@item Support for Java tools.
+@item Build GUI backend as a bundle (default). 
+@item Remove backend part of LIBRARY_COMBO.
+@item Fixes to run on FreeBSD, Solaris.
+@end itemize
+
+@ifclear ANNOUNCE-ONLY
+
 @section Changes in version @samp{1.0.0}
 
 @itemize @bullet
@@ -18,7 +29,6 @@ The currently released version is @samp{@value{GNUSTEP-MAKE-VERSION}}.
 @item Better checking for mingw and cygwin
 @end itemize
 
-@ifclear ANNOUNCE-ONLY
 @section Changes in version @samp{0.9.2}
 
 @itemize @bullet

config.site

@@ -50,11 +50,19 @@ fi
 
 # Change the binary directory default
 if test "$bindir" = "\${exec_prefix}/bin" ; then
-   bindir="\${exec_prefix}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}"
+   if [ -z "$GNUSTEP_FLATTENED" ]; then
+     bindir="\${exec_prefix}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}"
+   else
+     bindir="\${exec_prefix}/Tools"
+   fi
    bindirtop="\${exec_prefix}/Tools"
 fi
 if test "$DIR_BIN" = "/usr/local/bin" ; then
-   DIR_BIN="\${prefix}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}"
+   if [ -z "$GNUSTEP_FLATTENED" ]; then
+     DIR_BIN="\${prefix}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}"
+   else
+     DIR_BIN="\${exec_prefix}/Tools"
+   fi
    bindirtop="\${exec_prefix}/Tools"
 fi
 
@@ -72,7 +80,11 @@ fi
 
 # Change the library directory default
 if test "$libdir" = "\${exec_prefix}/lib" ; then
-   libdir="\${exec_prefix}/Libraries/${GNUSTEP_TARGET_CPU}/${GNUSTEP_TARGET_OS}"
+   if [ -z "$GNUSTEP_FLATTENED" ]; then
+     libdir="\${exec_prefix}/Libraries/${GNUSTEP_TARGET_CPU}/${GNUSTEP_TARGET_OS}"
+  else
+     libdir="\${exec_prefix}/Libraries
+  fi
 fi
 
 # Change the include directory default