mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "perl: Fix build and test to work with separated builds."

Browse Source 
This reverts commit 4ea016dae9.
This commit is contained in:
Hilko Bengen
2013-05-29 00:58:17 +02:00
parent 222a7b56f3
commit cdc4413dac
6 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -287,7 +287,6 @@ Makefile.in
/perl/MYMETA.json
/perl/MYMETA.yml
/perl/pm_to_blib
/perl/run-perl-tests
/php/extension/acinclude.m4
/php/extension/aclocal.m4
/php/extension/autom4te.cache

2
configure.ac
View File

@@ -1557,8 +1557,6 @@ AC_CONFIG_FILES([appliance/libguestfs-make-fixed-appliance],
[chmod +x,-w appliance/libguestfs-make-fixed-appliance])
AC_CONFIG_FILES([inspector/test-xmllint.sh],
[chmod +x,-w inspector/test-xmllint.sh])
AC_CONFIG_FILES([perl/run-perl-tests],
[chmod +x,-w perl/run-perl-tests])
AC_CONFIG_FILES([pick-guests.pl],
[chmod +x,-w pick-guests.pl])
AC_CONFIG_FILES([podwrapper.pl],

6
perl/Makefile.PL.in
View File

@@ -19,13 +19,13 @@ use Config;
use ExtUtils::MakeMaker;
WriteMakefile (
FIRST_MAKEFILE => '@abs_builddir@/Makefile-pl',
FIRST_MAKEFILE => 'Makefile-pl',
NAME => 'Sys::Guestfs',
VERSION => '0.@MAX_PROC_NR@',
LIBS => '-L@abs_top_builddir@/src/.libs -lguestfs',
INC => '-I@abs_top_builddir@/src -I@abs_top_srcdir@/src',
LIBS => '-L@top_builddir@/src/.libs -lguestfs',
INC => '-I@top_builddir@/src -I@top_srcdir@/src',
TYPEMAPS => [ '@srcdir@/typemap' ],
CCFLAGS => $Config{ccflags} . ' -DGUESTFS_PRIVATE=1 @CFLAGS@',
);

14
perl/Makefile.am
View File

@@ -64,20 +64,10 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test
INSTALLDIRS = site
all: Makefile-pl src_deps
$(MAKE) -C $(srcdir) -f $(abs_builddir)/Makefile-pl \
INST_ARCHLIB=$(abs_builddir)/blib/arch \
INST_SCRIPT=$(abs_builddir)/blib/script \
INST_BIN=$(abs_builddir)/blib/bin \
INST_LIB=$(abs_builddir)/blib/lib \
INST_MAN1DIR=$(abs_builddir)/blib/man1 \
INST_MAN3DIR=$(abs_builddir)/blib/man3 \
TEST_FILES=$(abs_srcdir)/t/*.t
$(MAKE) -f Makefile-pl
Makefile-pl: Makefile.PL
cd $(srcdir); \
perl $(abs_builddir)/Makefile.PL \
INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
sed -i 's,Makefile.PL,$(abs_builddir)/Makefile.PL,' $@
perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
# No! Otherwise it is deleted before the clean-local rule runs.
#CLEANFILES = Makefile-pl

2
perl/run-perl-tests.in → perl/run-perl-tests
View File

@@ -18,4 +18,4 @@
set -e
make -C $srcdir -f @abs_builddir@/Makefile-pl test "$@"
make -f Makefile-pl test "$@"

4
run.in
View File

@@ -90,9 +90,9 @@ export LD_LIBRARY_PATH
# For Perl.
if [ -z "$PERL5LIB" ]; then
PERL5LIB="$s/perl/lib:$b/perl/blib/lib:$b/perl/blib/arch"
PERL5LIB="$b/perl/blib/lib:$b/perl/blib/arch"
else
PERL5LIB="$s/perl/lib:$b/perl/blib/lib:$b/perl/blib/arch:$PERL5LIB"
PERL5LIB="$b/perl/blib/lib:$b/perl/blib/arch:$PERL5LIB"
fi
export PERL5LIB