git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Split images -> tests/data + tests/guests
[libguestfs.git]
/
perl
/
Makefile.am
diff --git
a/perl/Makefile.am
b/perl/Makefile.am
index
e1a6455
..
e924cb1
100644
(file)
--- a/
perl/Makefile.am
+++ b/
perl/Makefile.am
@@
-13,7
+13,7
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+# Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
include $(top_srcdir)/subdir-rules.mk
include $(top_srcdir)/subdir-rules.mk
@@
-46,7
+46,7
@@
src_deps: $(top_builddir)/src/libguestfs.la $(generator_built)
# Images used by tests
.PHONY: test_images
test_images:
# Images used by tests
.PHONY: test_images
test_images:
- $(MAKE) -C $(top_builddir)/
images
+ $(MAKE) -C $(top_builddir)/
tests/data
TESTS = run-bindtests run-perl-tests
TESTS = run-bindtests run-perl-tests
@@
-54,15
+54,15
@@
$(TESTS): src_deps all appliance test_images
TESTS_ENVIRONMENT = \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
TESTS_ENVIRONMENT = \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance
+ LIBGUESTFS_PATH=$(top_builddir)/appliance \
+ TMPDIR=$(top_builddir)
INSTALLDIRS = site
all: Makefile-pl src_deps
$(MAKE) -f Makefile-pl
INSTALLDIRS = site
all: Makefile-pl src_deps
$(MAKE) -f Makefile-pl
-Makefile-pl: Makefile.PL $(top_srcdir)/src/MAX_PROC_NR
- cd $(top_srcdir) && ./config.status --recheck
+Makefile-pl: Makefile.PL
perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
# No! Otherwise it is deleted before the clean-local rule runs.
perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
# No! Otherwise it is deleted before the clean-local rule runs.