Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
6
66
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Eric Vidal
66
Commits
5bc673a6
Commit
5bc673a6
authored
6 years ago
by
Eric Vidal
Browse files
Options
Downloads
Patches
Plain Diff
configure: fix system_dir path and user-logpath
parent
59d9affc
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure
+4
-6
4 additions, 6 deletions
configure
with
4 additions
and
6 deletions
configure
+
4
−
6
View file @
5bc673a6
...
@@ -25,11 +25,10 @@ Fine tuning of the installation directories:
...
@@ -25,11 +25,10 @@ Fine tuning of the installation directories:
--shebangdir=DIR absolute path for #! invocations [BINDIR]
--shebangdir=DIR absolute path for #! invocations [BINDIR]
--livedir=DIR default live directory [/run/66]
--livedir=DIR default live directory [/run/66]
--with-execline-bindir=DIR execlineb executable [PREFIX/bin]
--with-system-dir=DIR working directory for s6 tools as root[PREFIX/lib/66]
--with-system-dir=DIR working directory for s6 tools as root[PREFIX/lib/66]
--with-user-dir=DIR working directory for s6 tools as user[.66]
--with-user-dir=DIR working directory for s6 tools as user[.66]
--with-system-logpath=DIR log directory for root[/var/log/66]
--with-system-logpath=DIR log directory for root[/var/log/66]
--with-user-logpath=DIR log directory for user[.log
/66
]
--with-user-logpath=DIR log directory for user[.
66/
log]
--with-service-path=DIR service source directory[/etc/66]
--with-service-path=DIR service source directory[/etc/66]
Do not set an absolute path but a
$HOME
relative path for --with-user-dir
Do not set an absolute path but a
$HOME
relative path for --with-user-dir
...
@@ -37,8 +36,7 @@ Fine tuning of the installation directories:
...
@@ -37,8 +36,7 @@ Fine tuning of the installation directories:
automatically in function of the user.
automatically in function of the user.
For example , by default the final path for --with-user-dir will be
$HOME
/.66.
For example , by default the final path for --with-user-dir will be
$HOME
/.66.
If no --prefix option is given, by default with-execline-bindir will be /usr/bin,
If no --prefix option is given, by default with-system-dir will be /var/lib/66.
and with-system-dir will be /usr/lib/66.
Dependencies:
Dependencies:
--with-include=DIR add DIR to the list of searched directories for headers
--with-include=DIR add DIR to the list of searched directories for headers
...
@@ -153,7 +151,7 @@ livedir='/run/66'
...
@@ -153,7 +151,7 @@ livedir='/run/66'
system_dir
=
'$prefix/lib/66'
system_dir
=
'$prefix/lib/66'
user_dir
=
'.66'
user_dir
=
'.66'
system_logpath
=
'/var/log/66'
system_logpath
=
'/var/log/66'
user_logpath
=
'.log
/66
'
user_logpath
=
'.
66/
log'
service_paht
=
'/etc/66'
service_paht
=
'/etc/66'
shared
=
false
shared
=
false
static
=
true
static
=
true
...
@@ -226,7 +224,7 @@ if test -z "$prefix" ; then
...
@@ -226,7 +224,7 @@ if test -z "$prefix" ; then
includedir
=
/usr/include
includedir
=
/usr/include
fi
fi
if
test
"
$system_dir
"
=
'$prefix/lib/66'
;
then
if
test
"
$system_dir
"
=
'$prefix/lib/66'
;
then
system_dir
=
/
us
r/lib/66
system_dir
=
/
va
r/lib/66
fi
fi
fi
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment