projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move PSPP shared libraries from $(libdir) to $(libdir)/pspp.
[pspp]
/
perl-module
/
automake.mk
diff --git
a/perl-module/automake.mk
b/perl-module/automake.mk
index 93b9bc0ec1887459c7f6e6212665e585a9e75a6f..f09923f137f836717bba4eec0f48fd2f8877809c 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
+MAKE_PERL = $(MAKE) $(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,11
+30,11
@@
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
) tardist
PHONY += module-make
module-make: perl-module/Makefile
PHONY += module-make
module-make: perl-module/Makefile
- cd perl-module && $(MAKE
) $(AM_MAKEFLAGS
)
+ cd perl-module && $(MAKE
_PERL
)
ALL_LOCAL += perl_module_tarball
perl_module_tarball: $(module_sources) src/libpspp-core.la
ALL_LOCAL += perl_module_tarball
perl_module_tarball: $(module_sources) src/libpspp-core.la
@@
-47,7
+49,7
@@
perl_module_tarball: $(module_sources) src/libpspp-core.la
fi ; \
done \
fi
fi ; \
done \
fi
- $(MAKE
) $(AM_MAKEFLAGS
) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
+ $(MAKE
_PERL
) 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: