Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cta
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
Container registry
Harbor 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
dCache
cta
Commits
252629f2
Commit
252629f2
authored
11 years ago
by
Steven Murray
Browse files
Options
Downloads
Patches
Plain Diff
I was able to put back the CastorInstallDir function by taking Eric's advice
that one only need to escape the $ENV{DESTDIR}.
parent
60726a1f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+7
-3
7 additions, 3 deletions
CMakeLists.txt
xrootd/CMakeLists.txt
+11
-11
11 additions, 11 deletions
xrootd/CMakeLists.txt
with
18 additions
and
14 deletions
CMakeLists.txt
+
7
−
3
View file @
252629f2
...
...
@@ -127,6 +127,10 @@ function (CastorAddProC _name)
PROPERTY COMPILE_FLAGS
"
${
ORACLE_CPPFLAGS
}
-Wno-error"
)
endfunction
()
function
(
CastorInstallDir _name
)
install
(
CODE
"FILE(MAKE_DIRECTORY
\$
ENV{DESTDIR}
${
_name
}
)"
)
endfunction
()
function
(
CastorInstallEtcCronD _name
)
install
(
FILES
${
_name
}
.cron_d
DESTINATION /etc/cron.d
...
...
@@ -262,10 +266,10 @@ if(NOT DEFINED COMPILE_PACKAGING)
endif
(
NOT DEFINED COMPILE_PACKAGING
)
################################################################################
#
Create shared directories at install time
#
Rules to install the shared log and spool directories
################################################################################
install
(
CODE
"FILE(MAKE_DIRECTORY
\$
ENV{DESTDIR}
/var/log/castor)
"
)
install
(
CODE
"FILE(MAKE_DIRECTORY
\$
ENV{DESTDIR}/var
/spool/castor)
"
)
CastorInstallDir
(
/var/log/castor
)
CastorInstallDir
(
/var/log
/spool/castor
)
################################################################################
# Include the subdirectories of the project
...
...
This diff is collapsed.
Click to expand it.
xrootd/CMakeLists.txt
+
11
−
11
View file @
252629f2
...
...
@@ -113,14 +113,14 @@ CastorInstallSysconfigExample (xrootd.manager)
################################################################################
# Rules to install the log, spool and run directories of xrootd
################################################################################
install
(
CODE
"FILE(MAKE_DIRECTORY
\$
ENV{DESTDIR}
/var/log/castor)
"
)
install
(
CODE
"FILE(MAKE_DIRECTORY
\$
ENV{DESTDIR}
/var/spool/castor)
"
)
install
(
CODE
"FILE(MAKE_DIRECTORY
\$
ENV{DESTDIR}
/var/log/xrootd/manager)
"
)
install
(
CODE
"FILE(MAKE_DIRECTORY
\$
ENV{DESTDIR}
/var/log/xrootd/server)
"
)
install
(
CODE
"FILE(MAKE_DIRECTORY
\$
ENV{DESTDIR}
/var/log/xrootd/manager/proc)
"
)
install
(
CODE
"FILE(MAKE_DIRECTORY
\$
ENV{DESTDIR}
/var/log/xrootd/server/proc)
"
)
install
(
CODE
"FILE(MAKE_DIRECTORY
\$
ENV{DESTDIR}
/var/spool/xrootd/admin)
"
)
install
(
CODE
"FILE(MAKE_DIRECTORY
\$
ENV{DESTDIR}
/var/spool/xrootd/core)
"
)
install
(
CODE
"FILE(MAKE_DIRECTORY
\$
ENV{DESTDIR}
/var/spool/xrootd/manager)
"
)
install
(
CODE
"FILE(MAKE_DIRECTORY
\$
ENV{DESTDIR}
/var/spool/xrootd/server)
"
)
install
(
CODE
"FILE(MAKE_DIRECTORY
\$
ENV{DESTDIR}
/var/run/xrootd)
"
)
CastorInstallDir
(
/var/log/castor
)
CastorInstallDir
(
/var/spool/castor
)
CastorInstallDir
(
/var/log/xrootd/manager
)
CastorInstallDir
(
/var/log/xrootd/server
)
CastorInstallDir
(
/var/log/xrootd/manager/proc
)
CastorInstallDir
(
/var/log/xrootd/server/proc
)
CastorInstallDir
(
/var/spool/xrootd/admin
)
CastorInstallDir
(
/var/spool/xrootd/core
)
CastorInstallDir
(
/var/spool/xrootd/manager
)
CastorInstallDir
(
/var/spool/xrootd/server
)
CastorInstallDir
(
/var/run/xrootd
)
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