Changed into --with-layout=linux into --with-layout=fhs

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24603 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2007-02-16 13:51:24 +00:00
parent 9fa51275fc
commit cee487309c
6 changed files with 28 additions and 16 deletions

View file

@ -1,3 +1,15 @@
2007-02-16 Nicola Pero <nicola.pero@meta-innovation.com>
Renamed --with-layout=linux option to --with-layout=fhs.
* FilesystemLayouts/fhs: New file replacing
FilesystemLayouts/linux. Also, fixed all comments.
* FilesystemLayouts/fhs-system: New file replacing
FilesystemLayouts/linux-system. Also, fixed all comments.
* FilesystemLayouts/README: Corresponding updates.
* configure.ac: Updated to mention 'fhs' layout, not 'linux'.
* configure: Regenerated.
(Suggestion from Yavor Doganov <yavor@doganov.org>)
2007-02-16 Nicola Pero <nicola.pero@meta-innovation.com>
Completed implementation of customizable filesystem layouts

View file

@ -9,9 +9,9 @@ in gnustep-make's ./configure.
Eg,
./configure --with-layout=linux
./configure --with-layout=fhs
./configure --with-layout=linux-system
./configure --with-layout=fhs-system
By default, the GNUstep layout is used. The files are shell files
that are directly include by ./configure and that should set the
@ -32,19 +32,19 @@ source a special script (GNUstep.sh) before being able to use the
layout. Recommended for the advanced GNUstep users and the
NeXTstep/Apple fans.
* linux: standard Linux FHS layout for locally compiled software; it
* fhs: standard FHS Unix layout for locally compiled software; it
installs everything into /usr/local. Blends very well with native
GNU/Linux systems (and other Unix systems with similar directory
structure). Recommended if you're compiling from sources on Unix and
want good integration with your native system.
* linux-system: standard Linux FHS layout for software to be shipped
as part of distributions/systems; it installs system stuff into /usr,
and is ready to support local stuff to be installed into /usr/local.
Blends wonderfully with native GNU/Linux systems (and other Unix
systems with similar directory structure) as you're installing
everything straight into the standard system locations. Recommended
if you're building packages for a Unix system.
* fhs-system: standard FHS layout for software to be shipped as part
of distributions/systems; it installs system stuff into /usr, and is
ready to support local stuff to be installed into /usr/local. Blends
wonderfully with native GNU/Linux systems (and other Unix systems with
similar directory structure) as you're installing everything straight
into the standard system locations. Recommended if you're building
packages for a Unix system.
* windows: a GNUstep filesystem layout that installs by default into
C:/GNUstep. Recommend if you're compiling on Windows.

6
configure vendored
View file

@ -902,7 +902,7 @@ Optional Packages:
to choose which one you want (or create your own). If a layout
is specified, we automatically avoid importing an existing config
file. The default layout is 'gnustep'.
Example: --with-layout=linux
Example: --with-layout=fhs
--with-config-file=PATH
@ -3379,7 +3379,7 @@ fi
# If it wasn't passed, then we want to know because in that case we
# want to use the specified default prefix for that filesystem. For
# example, the 'gnustep' filesystem will install by default in
# /usr/GNUstep, while the 'linux' filesystem will install by default
# /usr/GNUstep, while the 'fhs' filesystem will install by default
# in /usr/local, and the 'windows' one in C:/GNUstep. Please note
# that AC_PREFIX_DEFAULT will actually be done at the very beginning
# of ./configure, not here. So we wouldn't have access to all the
@ -3737,7 +3737,7 @@ if test "$ac_cv_flattened" = "no"; then
GNUSTEP_IS_FLATTENED=no;
# FIXME - maybe we should have a warning here if you try to
# use 'linux' or 'linux-system' layout with non-flattened!
# use 'fhs' or 'fhs-system' layout with non-flattened!
else
GNUSTEP_FLATTENED=yes;
GNUSTEP_IS_FLATTENED=yes;

View file

@ -208,7 +208,7 @@ AC_ARG_WITH(layout,[
to choose which one you want (or create your own). If a layout
is specified, we automatically avoid importing an existing config
file. The default layout is 'gnustep'.
Example: --with-layout=linux
Example: --with-layout=fhs
],
GNUSTEP_FILESYSTEM_LAYOUT="$withval",)
@ -273,7 +273,7 @@ fi
# If it wasn't passed, then we want to know because in that case we
# want to use the specified default prefix for that filesystem. For
# example, the 'gnustep' filesystem will install by default in
# /usr/GNUstep, while the 'linux' filesystem will install by default
# /usr/GNUstep, while the 'fhs' filesystem will install by default
# in /usr/local, and the 'windows' one in C:/GNUstep. Please note
# that AC_PREFIX_DEFAULT will actually be done at the very beginning
# of ./configure, not here. So we wouldn't have access to all the
@ -642,7 +642,7 @@ if test "$ac_cv_flattened" = "no"; then
GNUSTEP_IS_FLATTENED=no;
# FIXME - maybe we should have a warning here if you try to
# use 'linux' or 'linux-system' layout with non-flattened!
# use 'fhs' or 'fhs-system' layout with non-flattened!
else
GNUSTEP_FLATTENED=yes;
GNUSTEP_IS_FLATTENED=yes;