Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
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
Service Desk
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
d07021b0
Commit
d07021b0
authored
17 years ago
by
Danny Auble
Browse files
Options
Downloads
Patches
Plain Diff
svn merge -r12740:12743
https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
parent
c66b31cc
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
contribs/torque/Makefile.am
+3
-5
3 additions, 5 deletions
contribs/torque/Makefile.am
contribs/torque/Makefile.in
+3
-5
3 additions, 5 deletions
contribs/torque/Makefile.in
with
6 additions
and
10 deletions
contribs/torque/Makefile.am
+
3
−
5
View file @
d07021b0
...
@@ -17,11 +17,9 @@ install-binSCRIPTS: $(bin_SCRIPTS)
...
@@ -17,11 +17,9 @@ install-binSCRIPTS: $(bin_SCRIPTS)
@$(
NORMAL_INSTALL
)
@$(
NORMAL_INSTALL
)
test
-z
"
$(
bindir
)
"
||
$(
MKDIR_P
)
"
$(
DESTDIR
)$(
bindir
)
"
test
-z
"
$(
bindir
)
"
||
$(
MKDIR_P
)
"
$(
DESTDIR
)$(
bindir
)
"
@
list
=
'
$(
bin_SCRIPTS
)
'
;
for
p
in
$$
list
;
do
\
@
list
=
'
$(
bin_SCRIPTS
)
'
;
for
p
in
$$
list
;
do
\
echo
"
$(
INSTALL_PROGRAM_ENV
)
$(
LIBTOOL
)
--mode=install
$(
binSCRIPT_INSTALL
)
'
$(
top_srcdir
)
/contribs/torque/
$$
p.pl' '
$(
DESTDIR
)$(
bindir
)
/
$$
p.pl'"
;
\
echo
"sed 's%use lib .*%use lib qw(
${
exec_prefix
}
/lib
${
exec_prefix
}
/lib/perl5);%'
$(
top_srcdir
)
/contribs/torque/
$$
p.pl >
$(
DESTDIR
)$(
bindir
)
/
$$
p"
;
\
$(
INSTALL_PROGRAM_ENV
)
$(
LIBTOOL
)
--mode
=
install
$(
binSCRIPT_INSTALL
)
"
$(
top_srcdir
)
/contribs/torque/
$$
p.pl"
"
$(
DESTDIR
)$(
bindir
)
/
$$
p.pl"
||
exit
1
;
\
sed
's%use lib .*%use lib qw(@libdir@ @libdir@/perl5);%'
$(
top_srcdir
)
/contribs/torque/
$$
p.pl
>
$(
DESTDIR
)$(
bindir
)
/
$$
p
;
\
echo
"sed 's%use lib .*%use lib qw(
${
exec_prefix
}
/lib
${
exec_prefix
}
/lib/perl5);%'
$(
DESTDIR
)$(
bindir
)
/
$$
p.pl >
$(
DESTDIR
)$(
bindir
)
/
$$
p"
;
\
chmod
755
$(
DESTDIR
)$(
bindir
)
/
$$
p
;
\
sed
's%use lib .*%use lib qw(@libdir@ @libdir@/perl5);%'
$(
DESTDIR
)$(
bindir
)
/
$$
p.pl
>
$(
DESTDIR
)$(
bindir
)
/
$$
p
;
\
$(
RM
)
$(
DESTDIR
)$(
bindir
)
/
$$
p.pl
;
\
done
done
uninstall-binSCRIPTS
:
uninstall-binSCRIPTS
:
...
...
This diff is collapsed.
Click to expand it.
contribs/torque/Makefile.in
+
3
−
5
View file @
d07021b0
...
@@ -417,11 +417,9 @@ install-binSCRIPTS: $(bin_SCRIPTS)
...
@@ -417,11 +417,9 @@ install-binSCRIPTS: $(bin_SCRIPTS)
@$(
NORMAL_INSTALL
)
@$(
NORMAL_INSTALL
)
test
-z
"
$(
bindir
)
"
||
$(
MKDIR_P
)
"
$(
DESTDIR
)$(
bindir
)
"
test
-z
"
$(
bindir
)
"
||
$(
MKDIR_P
)
"
$(
DESTDIR
)$(
bindir
)
"
@
list
=
'
$(
bin_SCRIPTS
)
'
;
for
p
in
$$
list
;
do
\
@
list
=
'
$(
bin_SCRIPTS
)
'
;
for
p
in
$$
list
;
do
\
echo
"
$(
INSTALL_PROGRAM_ENV
)
$(
LIBTOOL
)
--mode=install
$(
binSCRIPT_INSTALL
)
'
$(
top_srcdir
)
/contribs/torque/
$$
p.pl' '
$(
DESTDIR
)$(
bindir
)
/
$$
p.pl'"
;
\
echo
"sed 's%use lib .*%use lib qw(
${
exec_prefix
}
/lib
${
exec_prefix
}
/lib/perl5);%'
$(
top_srcdir
)
/contribs/torque/
$$
p.pl >
$(
DESTDIR
)$(
bindir
)
/
$$
p"
;
\
$(
INSTALL_PROGRAM_ENV
)
$(
LIBTOOL
)
--mode
=
install
$(
binSCRIPT_INSTALL
)
"
$(
top_srcdir
)
/contribs/torque/
$$
p.pl"
"
$(
DESTDIR
)$(
bindir
)
/
$$
p.pl"
||
exit
1
;
\
sed
's%use lib .*%use lib qw(@libdir@ @libdir@/perl5);%'
$(
top_srcdir
)
/contribs/torque/
$$
p.pl
>
$(
DESTDIR
)$(
bindir
)
/
$$
p
;
\
echo
"sed 's%use lib .*%use lib qw(
${
exec_prefix
}
/lib
${
exec_prefix
}
/lib/perl5);%'
$(
DESTDIR
)$(
bindir
)
/
$$
p.pl >
$(
DESTDIR
)$(
bindir
)
/
$$
p"
;
\
chmod
755
$(
DESTDIR
)$(
bindir
)
/
$$
p
;
\
sed
's%use lib .*%use lib qw(@libdir@ @libdir@/perl5);%'
$(
DESTDIR
)$(
bindir
)
/
$$
p.pl
>
$(
DESTDIR
)$(
bindir
)
/
$$
p
;
\
$(
RM
)
$(
DESTDIR
)$(
bindir
)
/
$$
p.pl
;
\
done
done
uninstall-binSCRIPTS
:
uninstall-binSCRIPTS
:
...
...
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
