projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
perl-module
/
automake.mk
diff --git
a/perl-module/automake.mk
b/perl-module/automake.mk
index becee71b18c310d1c9302204b4399ef88d191931..fae888633b2e8625a9cd001b80ff7bde6275ae66 100644
(file)
--- a/
perl-module/automake.mk
+++ b/
perl-module/automake.mk
@@
-15,6
+15,8
@@
module_sources = \
perl-module/lib/PSPP.pm \
perl-module/t/Pspp.t
perl-module/lib/PSPP.pm \
perl-module/t/Pspp.t
+PERL_MAKEFLAGS = $(AM_MAKEFLAGS) LD_RUN_PATH=$(pkglibdir)
+
perl-module/pspp-module-config: Makefile
(echo '%Locations = (';\
printf " SourceDir => '";\
perl-module/pspp-module-config: Makefile
(echo '%Locations = (';\
printf " SourceDir => '";\
@@
-28,15
+30,15
@@
perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config $(m
perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources) perl-module/Makefile
rm -f $@
perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources) perl-module/Makefile
rm -f $@
- cd perl-module && $(MAKE) $(
AM
_MAKEFLAGS) tardist
+ cd perl-module && $(MAKE) $(
PERL
_MAKEFLAGS) tardist
PHONY += module-make
PHONY += module-make
-module-make: perl-module/Makefile
src/libpspp-core.la
- cd perl-module && $(MAKE) $(
AM
_MAKEFLAGS)
+module-make: perl-module/Makefile
+ cd perl-module && $(MAKE) $(
PERL
_MAKEFLAGS)
ALL_LOCAL += perl_module_tarball
ALL_LOCAL += perl_module_tarball
-perl_module_tarball: $(module_sources)
- if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
+perl_module_tarball: $(module_sources)
src/libpspp-core.la
+
@
if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
for f in $(module_sources); do \
destdir=`dirname $$f` ;\
mkdir -p $$destdir ;\
for f in $(module_sources); do \
destdir=`dirname $$f` ;\
mkdir -p $$destdir ;\
@@
-47,7
+49,7
@@
perl_module_tarball: $(module_sources)
fi ; \
done \
fi
fi ; \
done \
fi
- $(MAKE) $(
AM
_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
+ $(MAKE) $(
PERL
_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
CLEAN_LOCAL += perl_module_clean
perl_module_clean:
CLEAN_LOCAL += perl_module_clean
perl_module_clean: