Changeset 5025
Changeset index | Previous changeset | Next changeset

Introduction of new layouts, as taken from ticket #389. I hope they make sense,
as I have no way to check.

Committed by:  coppice
Date:  Jul 03 2008 * 16:13 (about 1 month ago)

Affected files:

callweaver/branches/rel/1.2/configure.ac (unified diff)

r5011r5025
194194 # ==========================================================================
195195 # Directory layouts are defined in separate layout profiles:
196196 # --------------------------------------------------------------------------
197 # profile filename description
197 # profile filename description
198198 # --------------------------------------------------------------------------
199 # bsd layout.bsd follow convention used by BSD ports system
200 # bsd-romfs layout.bsd-romfs BSD embedded devices with ROM filesystems
201 # fhs layout.fhs follow Filesystem Hierarchy Standard (FHS)
202 # lsb layout.lsb follow Linux Standards Base (LSB) standard
203 # lsb-romfs layout.lsb-romfs Linux embedded devices with ROM filesystems
204 # singledir built-in install everything under a single directory
199 # freebsd layout.freebsd follow convention used by FreeBSD ports system
200 # freebsd-romfs layout.freebsd-romfs FreeBSD embedded devices with ROM filesystems
201 # openbsd layout.openbsd follow convention used by OpenBSD ports system
202 # fhs layout.fhs follow Filesystem Hierarchy Standard (FHS)
203 # lsb layout.lsb follow Linux Standards Base (LSB) standard
204 # lsb-romfs layout.lsb-romfs Linux embedded devices with ROM filesystems
205 # singledir built-in install everything under a single directory
205206 # --------------------------------------------------------------------------
206207 #
207208 # The default directory layout is OS dependent:
208209 # --------------------------------------------------------------------------
209 # OS type default profile
210 # host OS default profile
210211 # --------------------------------------------------------------------------
211 # BSD bsd
212 # Linux lsb
213 # Solaris singledir, using prefix /opt/csw/callweaver
212 # FreeBSD freebsd
213 # OpenBSD openbsd
214 # Linux lsb
215 # Solaris singledir, using prefix /opt/csw/callweaver
214216 # --------------------------------------------------------------------------
215217 #
216218 # Directory layout profiles contain a list of key=value pairs, *without* any
------
350352
351353 # define commandline parameter --with-directory-layout
352354 AC_ARG_WITH([directory-layout],
353 [AC_HELP_STRING([--with-directory-layout],[Specify an installation directory layout, either a pre-defined or a user-defined profile. Pre-defined profiles are bsd, bsd-romfs, fhs, lsb, lsb-romfs and singledir. The default is OS dependent.])],,[with_directory_layout="automatic"])
355 [AC_HELP_STRING([--with-directory-layout],[Specify an installation directory layout, either a pre-defined or a user-defined profile. Pre-defined profiles are fhs, freebsd, freebsd-romfs, lsb, lsb-romfs, openbsd and singledir. The default is OS dependent.])],,[with_directory_layout="automatic"])
354356
355357 # use OS specific default if no layout was specified
356358 if test "${with_directory_layout}" = "automatic"; then
357359 AC_MSG_NOTICE([Directory layout will be set automatically...])
358 case "${ostype}" in
359 bsd)
360 # use BSD profile in file layout.bsd
361 with_directory_layout="bsd"
360 case "${host_os}" in
361 freebsd*)
362 # use FreeBSD profile in file layout.freebsd
363 with_directory_layout="freebsd"
362364 ;;
363 linux)
365 openbsd*)
366 # use OpenBSD profile in file layout.openbsd
367 with_directory_layout="openbsd"
368 ;;
369 linux*)
364370 # use LSB profile in file layout.lsb
365371 with_directory_layout="lsb"
366372 ;;
367 solaris)
373 solaris*)
368374 # use built-in SINGLEDIR profile
369375 with_directory_layout="singledir"
370376 ;;

callweaver/branches/rel/1.2/layout.bsd (unified diff)

r4723r5025
1 # BSD directory layout
2 helpstring="follow the BSD ports system convention"
3 cwprefix=/usr/local
4 cwexecdir=${prefix}/libexec
5 cwutilsdir=${prefix}/sbin
6 cwconfdir=${prefix}/etc/callweaver
7 cwlibdir=${prefix}/lib/callweaver
8 cwvardir=${prefix}/var/lib/callweaver
9 cwdatadir=${prefix}/share/callweaver
10 cwlogdir=${prefix}/var/log
11 cwrundir=${prefix}/var/run
12 cwspooldir=${prefix}/var/spool/callweaver
13 cwmandir=${prefix}/man
14 cwdocdir=${prefix}/share/doc/callweaver

callweaver/branches/rel/1.2/layout.bsd-romfs (unified diff)

r4723r5025
1 # BSD-ROMFS directory layout
2 helpstring="for BSD embedded devices with ROM filesystems"
3 cwprefix=
4 cwexecdir=/usr/libexec
5 cwutilsdir=/usr/sbin
6 cwconfdir=/etc/callweaver
7 cwlibdir=/usr/lib/callweaver
8 cwvardir=/var/lib/callweaver
9 cwdatadir=/usr/share/callweaver
10 cwlogdir=/var/log/callweaver
11 cwrundir=/var/run
12 cwspooldir=/var/spool/callweaver
13 cwmandir=/usr/share/man
14 cwdocdir=/usr/share/doc