From b6f95b7d1b4e7607aedc69f51e2d0c8363e49d65 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 18 Mar 2010 17:01:13 +0000
Subject: [PATCH] removed links for perlapi, compile from src as you would
expect
---
contribs/perlapi/libslurm/Makefile.am | 32 ++++++++-----------
contribs/perlapi/libslurm/Makefile.in | 32 ++++++++-----------
contribs/perlapi/libslurm/perl/Makefile.PL.in | 6 ++--
3 files changed, 31 insertions(+), 39 deletions(-)
diff --git a/contribs/perlapi/libslurm/Makefile.am b/contribs/perlapi/libslurm/Makefile.am
index 4683cea8cd2..d15f43a84a9 100644
--- a/contribs/perlapi/libslurm/Makefile.am
+++ b/contribs/perlapi/libslurm/Makefile.am
@@ -2,28 +2,24 @@ AUTOMAKE_OPTIONS = foreign
# copied from pidgin
#
perl_dir = perl
+perl_src_dir = ${abs_srcdir}/${perl_dir}
perlpath = /usr/bin/perl
perl_sources = \
- $(perl_dir)/Makefile.PL.in \
- $(perl_dir)/ppport.h \
- $(perl_dir)/Slurm.pm \
- $(perl_dir)/Slurm.xs \
- $(perl_dir)/typemap \
- $(perl_dir)/msg.h \
- $(perl_dir)/alloc.c \
- $(perl_dir)/conf.c \
- $(perl_dir)/job.c \
- $(perl_dir)/launch.c \
- $(perl_dir)/node.c \
- $(perl_dir)/partition.c \
- $(perl_dir)/trigger.c
+ $(perl_src_dir)/Makefile.PL.in \
+ $(perl_src_dir)/ppport.h \
+ $(perl_src_dir)/Slurm.pm \
+ $(perl_src_dir)/Slurm.xs \
+ $(perl_src_dir)/typemap \
+ $(perl_src_dir)/msg.h \
+ $(perl_src_dir)/alloc.c \
+ $(perl_src_dir)/conf.c \
+ $(perl_src_dir)/job.c \
+ $(perl_src_dir)/launch.c \
+ $(perl_src_dir)/node.c \
+ $(perl_src_dir)/partition.c \
+ $(perl_src_dir)/trigger.c
$(perl_dir)/Makefile: $(perl_dir)/Makefile.PL
- @if test "x${top_srcdir}" != "x${top_builddir}"; then \
- for f in ${perl_sources}; do \
- ${LN_S} -f ${abs_srcdir}/$$f $$f; \
- done; \
- fi
@cd $(perl_dir) && $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix}
#
diff --git a/contribs/perlapi/libslurm/Makefile.in b/contribs/perlapi/libslurm/Makefile.in
index 7ce6096e7cb..58a466bf616 100644
--- a/contribs/perlapi/libslurm/Makefile.in
+++ b/contribs/perlapi/libslurm/Makefile.in
@@ -268,21 +268,22 @@ AUTOMAKE_OPTIONS = foreign
# copied from pidgin
#
perl_dir = perl
+perl_src_dir = ${abs_srcdir}/${perl_dir}
perlpath = /usr/bin/perl
perl_sources = \
- $(perl_dir)/Makefile.PL.in \
- $(perl_dir)/ppport.h \
- $(perl_dir)/Slurm.pm \
- $(perl_dir)/Slurm.xs \
- $(perl_dir)/typemap \
- $(perl_dir)/msg.h \
- $(perl_dir)/alloc.c \
- $(perl_dir)/conf.c \
- $(perl_dir)/job.c \
- $(perl_dir)/launch.c \
- $(perl_dir)/node.c \
- $(perl_dir)/partition.c \
- $(perl_dir)/trigger.c
+ $(perl_src_dir)/Makefile.PL.in \
+ $(perl_src_dir)/ppport.h \
+ $(perl_src_dir)/Slurm.pm \
+ $(perl_src_dir)/Slurm.xs \
+ $(perl_src_dir)/typemap \
+ $(perl_src_dir)/msg.h \
+ $(perl_src_dir)/alloc.c \
+ $(perl_src_dir)/conf.c \
+ $(perl_src_dir)/job.c \
+ $(perl_src_dir)/launch.c \
+ $(perl_src_dir)/node.c \
+ $(perl_src_dir)/partition.c \
+ $(perl_src_dir)/trigger.c
AM_CPPFLAGS = \
-DVERSION=\"$(VERSION)\" \
@@ -472,11 +473,6 @@ uninstall-am: uninstall-local
$(perl_dir)/Makefile: $(perl_dir)/Makefile.PL
- @if test "x${top_srcdir}" != "x${top_builddir}"; then \
- for f in ${perl_sources}; do \
- ${LN_S} -f ${abs_srcdir}/$$f $$f; \
- done; \
- fi
@cd $(perl_dir) && $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix}
#
diff --git a/contribs/perlapi/libslurm/perl/Makefile.PL.in b/contribs/perlapi/libslurm/perl/Makefile.PL.in
index f1e4b234e3a..ecf7500e1dd 100644
--- a/contribs/perlapi/libslurm/perl/Makefile.PL.in
+++ b/contribs/perlapi/libslurm/perl/Makefile.PL.in
@@ -83,10 +83,10 @@ $other_ld_flags = " -brtl -G -bnoentry -bgcbypass:1000 -bexpfull"
WriteMakefile(
NAME => 'Slurm',
- VERSION_FROM => 'Slurm.pm', # finds $VERSION
+ VERSION_FROM => '@abs_srcdir@/Slurm.pm', # finds $VERSION
PREREQ_PM => {}, # e.g., Module::Name => 1.1
($] >= 5.005 ? ## Add these new keywords supported since 5.005
- (ABSTRACT_FROM => 'Slurm.pm', # retrieve abstract from module
+ (ABSTRACT_FROM => '@abs_srcdir@/Slurm.pm', # retrieve abstract from module
AUTHOR => 'Hongjia Cao <hjcao@nudt.edu.cn>') : ()),
LIBS => ["-L@top_builddir@/src/api/.libs -L@prefix@/lib -lslurm"], # e.g., '-lm'
DEFINE => '', # e.g., '-DHAVE_SOMETHING'
@@ -94,7 +94,7 @@ WriteMakefile(
# Un-comment this if you add C files to link with later:
OBJECT => '$(O_FILES)', # link all the C files too
CCFLAGS => '-g',
- PM => {'Slurm.pm' => '$(INST_LIBDIR)/Slurm.pm'},
+ PM => {'@abs_srcdir@/Slurm.pm' => '$(INST_LIBDIR)/Slurm.pm'},
dynamic_lib => {'OTHERLDFLAGS' => $other_ld_flags},
);
--
GitLab