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
1e8d8122
Commit
1e8d8122
authored
5 years ago
by
Eric Vidal
Browse files
Options
Downloads
Patches
Plain Diff
pass --with-system-service-conf to datarootdir/66/conf
parent
7af075cd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure
+8
-11
8 additions, 11 deletions
configure
with
8 additions
and
11 deletions
configure
+
8
−
11
View file @
1e8d8122
...
...
@@ -32,10 +32,10 @@ Fine tuning of the installation directories:
--with-system-dir=DIR 66 tools system working directory[PREFIX/lib/66]
--with-system-service=DIR system service frontend directory[DATAROOTDIR/66/service]
--with-system-service-conf=DIR system service configuration file directory[
SYS
DIR/conf
/system
]
--with-system-service-conf=DIR system service configuration file directory[
DATAROOT
DIR/
66/
conf]
--with-sysadmin-service=DIR sysadmin service frontend directory[SYSDIR/service]
--with-sysadmin-service-conf=DIR sysadmin service configuration file directory[SYSDIR/conf
/sysadmin
]
--with-sysadmin-service-conf=DIR sysadmin service configuration file directory[SYSDIR/conf]
--with-user-dir=DIR 66 tools user working directory[.66]
--with-user-log=DIR user service log directory[.66/log]
...
...
@@ -170,9 +170,9 @@ livedir='/run/66'
system_dir
=
'$prefix/lib/66'
system_log
=
'/var/log/66'
service_system
=
'$datarootdir/66/service'
service_systemconf
=
'$
sysconf
dir/conf
/system
'
service_systemconf
=
'$
dataroot
dir/
66/
conf'
service_adm
=
'$sysconfdir/service'
service_admconf
=
'$sysconfdir/conf
/sysadmin
'
service_admconf
=
'$sysconfdir/conf'
user_dir
=
'.66'
service_user
=
'.66/service'
service_userconf
=
'.66/conf'
...
...
@@ -277,14 +277,11 @@ fi
# Add /etc/66 in the default case
if
test
-z
"
$sysconfdir
"
;
then
if
test
"
$service_systemconf
"
=
'$sysconfdir/conf/system'
;
then
service_systemconf
=
'$sysconfdir/conf/system'
fi
if
test
"
$service_adm
"
=
'$sysconfdir/service'
;
then
service_adm
=
'$sysconfdir/service'
fi
if
test
"
$service_admconf
"
=
'$sysconfdir/conf
/sysadmin
'
;
then
service_admconf
=
'$sysconfdir/conf
/sysadmin
'
if
test
"
$service_admconf
"
=
'$sysconfdir/conf'
;
then
service_admconf
=
'$sysconfdir/conf'
fi
fi
...
...
@@ -297,14 +294,14 @@ for i in exec_prefix dynlibdir libexecdir bindir libdir includedir shebangdir sp
done
stripdir datarootdir
for
i
in
service_system mandir
;
do
for
i
in
service_system
service_systemconf
mandir
;
do
eval
tmp
=
\$
{
$i
}
eval
$i
=
$tmp
stripdir
$i
done
stripdir sysconfdir
for
i
in
service_systemconf
service_adm service_admconf
;
do
for
i
in
service_adm service_admconf
;
do
eval
tmp
=
\$
{
$i
}
eval
$i
=
$tmp
stripdir
$i
...
...
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