diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 23 |
1 files changed, 7 insertions, 16 deletions
@@ -29,8 +29,7 @@ Fine tuning of the installation directories: --livedir=DIR run s6-rc live directory in DIR [s6-rc default|/run/s6-rc] --repodir=DIR s6-frontend working base [/var/lib/s6-frontend/repository] --bootdir=DIR location of the bootable s6-rc compiled db [/etc/s6-rc] - --syspkgdir=DIR location of service files for distro packages [/usr/lib/s6-frontend/s6-rc/source] - --localpkgdir=DIR location of service files for local packages [/etc/s6-frontend/s6-rc/source] + --with-def-path=PATH path to service files [LIBDIR/s6-frontend/s6-rc/source:SYSCONFDIR/s6-frontend/s6-rc/source] If no --prefix option is given, by default libdir (but not dynlibdir) will be /usr/lib, and includedir will be /usr/include. @@ -183,8 +182,7 @@ scandir= livedir= repodir=/var/lib/s6-frontend/s6-rc/repository bootdir=/etc/s6-rc -syspkgdir=/usr/lib/s6-frontend/s6-rc/source -localpkgdir=/etc/s6-frontend/s6-rc/source +defpath='$libdir/s6-frontend/s6-rc/source:$sysconfdir/s6-frontend/s6-rc/source' usensss=false uses6li=true useutillinux=false @@ -232,8 +230,7 @@ for arg ; do --livedir=*) livedir=${arg#*=} ;; --repodir=*) repodir=${arg#*=} ;; --bootdir=*) bootdir=${arg#*=} ;; - --syspkgdir=*) syspkgdir=${arg#*=} ;; - --localpkgdir=*) localpkgdir=${arg#*=} ;; + --with-def-path=*) defpath=${arg#*=} ;; --enable-nsss|--enable-nsss=yes) usensss=true ;; --disable-nsss|--enable-nsss=no) usensss=false ;; --enable-s6li|--enable-s6li=yes) uses6li=true ;; @@ -274,7 +271,7 @@ fi # Expand installation directories stripdir prefix -for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot ; do +for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot defpath ; do eval tmp=\${$i} eval $i=$tmp stripdir $i @@ -559,12 +556,9 @@ else echo "MAYBEPTHREAD_LIB :=" fi -echo "SCANDIR := $scandir" -echo "LIVEDIR := $livedir" echo "REPODIR := $repodir" echo "BOOTDIR := $bootdir" -echo "SYSPKGDIR := $syspkgdir" -echo "LOCALPKGDIR := $localpkgdir" +echo "DEFPATH := $defpath" if $adaemontools ; then echo "WRAP_DAEMONTOOLS := 1" @@ -647,11 +641,8 @@ echo "#define ${package_macro_name}_REPODIR \"$repodir\"" echo "#undef ${package_macro_name}_BOOTDIR" echo "#define ${package_macro_name}_BOOTDIR \"$bootdir\"" -echo "#undef ${package_macro_name}_SYSPKGDIR" -echo "#define ${package_macro_name}_SYSPKGDIR \"$syspkgdir\"" - -echo "#undef ${package_macro_name}_LOCALPKGDIR" -echo "#define ${package_macro_name}_LOCALPKGDIR \"$localpkgdir\"" +echo "#undef ${package_macro_name}_DEFPATH" +echo "#define ${package_macro_name}_DEFPATH \"$defpath\"" echo "#undef ${package_macro_name}_WRAP_DAEMONTOOLS" if $adaemontools ; then |