diff options
author | carlosg <carlosg> | 2006-12-10 16:09:01 +0000 |
---|---|---|
committer | carlosg <carlosg> | 2006-12-10 16:09:01 +0000 |
commit | d8c84e7591c62d692909449a7fe4a50c3a53441c (patch) | |
tree | 572d4e467066cecf4cc0e73184416e0eb19c3bf2 | |
parent | e47a0cd3a088a9ebbc28d6240624e2e74fbeea81 (diff) |
2006-12-10 Carlos Garnacho <carlosg@gnome.org>stb-2-0
* Net-DBus/Makefile.am: specify INSTALLSITEARCH, this should let perl
find the internal Net::DBus independently of the distro perl settings.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Net-DBus/Makefile.am | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2006-12-10 Carlos Garnacho <carlosg@gnome.org> + + * 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 <carlosg@gnome.org> * 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 |