From d8c84e7591c62d692909449a7fe4a50c3a53441c Mon Sep 17 00:00:00 2001 From: carlosg Date: Sun, 10 Dec 2006 16:09:01 +0000 Subject: 2006-12-10 Carlos Garnacho * Net-DBus/Makefile.am: specify INSTALLSITEARCH, this should let perl find the internal Net::DBus independently of the distro perl settings. --- ChangeLog | 5 +++++ Net-DBus/Makefile.am | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bf2897..86639d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-12-10 Carlos Garnacho + + * Net-DBus/Makefile.am: specify INSTALLSITEARCH, this should let perl + find the internal Net::DBus independently of the distro perl settings. + 2006-12-05 Carlos Garnacho * Network/Ifaces.pm (set_interface_config): do not try to enable diff --git a/Net-DBus/Makefile.am b/Net-DBus/Makefile.am index b3b4f61..aeecd11 100644 --- a/Net-DBus/Makefile.am +++ b/Net-DBus/Makefile.am @@ -19,11 +19,11 @@ fake_DATA=build-perl-stamp $(PERL_MAKEFILE): DBus.xs test -e Makefile.PL || $(LN_S) $(srcdir)/Makefile.PL . - VERSION=$(VERSION) CC=$(CC) CFLAGS="$(AM_CPPFLAGS) $(AM_CFLAGS) $(SWIG_OPTS) $(CPPFLAGS) $(AM_STANDARD_CFLAGS)" $(PERL) $(srcdir)/Makefile.PL DESTDIR=$(DESTDIR) PREFIX=$(modulesdir) $(MAKE_PL_OPTS) + VERSION=$(VERSION) CC=$(CC) CFLAGS="$(AM_CPPFLAGS) $(AM_CFLAGS) $(SWIG_OPTS) $(CPPFLAGS) $(AM_STANDARD_CFLAGS)" $(PERL) $(srcdir)/Makefile.PL DESTDIR=$(DESTDIR) PREFIX=$(modulesdir) INSTALLSITEARCH="$(netdbusdir)" $(MAKE_PL_OPTS) -perl install-perl: $(PERL_MAKEFILE) target=`echo $@ | sed -e 's/-perl//'`; \ - $(MAKE) -f $(PERL_MAKEFILE) DESTDIR=$(DESTDIR) PREFIX=$(modulesdir) $$target + $(MAKE) -f $(PERL_MAKEFILE) DESTDIR=$(DESTDIR) PREFIX=$(modulesdir) INSTALLSITEARCH="$(netdbusdir)" $$target test-perl: $(PERL_MAKEFILE) $(RUN)$(MAKE) -f $(PERL_MAKEFILE) test -- cgit v1.2.3