Mercurial > pidgin
diff libpurple/plugins/perl/Makefile.am @ 27093:77177e6000e4
Install the Purple and Pidgin perl modules under $libdir instead of in perl's
normal @INC locations. Since they aren't usable by perl directly existing
there just confused people and conflicted with similarly named perl modules.
Thanks Zsombor Welker. Fixes #5428
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Thu, 18 Jun 2009 23:01:51 +0000 |
| parents | e33a91b8b8f6 |
| children |
line wrap: on
line diff
--- a/libpurple/plugins/perl/Makefile.am Thu Jun 18 22:48:49 2009 +0000 +++ b/libpurple/plugins/perl/Makefile.am Thu Jun 18 23:01:51 2009 +0000 @@ -99,7 +99,7 @@ ${LN_S} -f $$srcloc/$$f $$f; \ done; \ fi - @cd common && $(perlpath) Makefile.PL $(PERL_MM_PARAMS) + @cd common && $(perlpath) Makefile.PL common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) @@ -108,7 +108,7 @@ @for dir in $(perl_dirs); do \ cd $$dir && \ if [ ! -f Makefile ]; then \ - $(perlpath) Makefile.PL $(PERL_MM_PARAMS); \ + $(perlpath) Makefile.PL; \ fi && \ ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \ $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \ @@ -164,6 +164,7 @@ -I$(top_srcdir) \ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ + -DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)\" \ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ $(PLUGIN_CFLAGS) \