From a7366a764aa8d549a16b58e43181fe4ff7e598ab Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Jan 2012 20:33:46 +0000 Subject: * Add a -I flag to the Perl bindings to nix-build and some other scripts. * Include the version and architecture in the -I flag so that there is at least a chance that a Nix binary built for one Perl version will run on another version. --- perl/Makefile.am | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'perl') diff --git a/perl/Makefile.am b/perl/Makefile.am index ccb08b447b1f..12293fc050a6 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -1,7 +1,3 @@ -perlversion := $(shell perl -e 'use Config; print $$Config{version};') -perlarchname := $(shell perl -e 'use Config; print $$Config{archname};') -perllibdir = $(libdir)/perl5/site_perl/$(perlversion)/$(perlarchname) - PERL_MODULES = lib/Nix/Store.pm lib/Nix/Manifest.pm lib/Nix/GeneratePatches.pm lib/Nix/SSH.pm lib/Nix/CopyClosure.pm lib/Nix/Config.pm.in # Hack required by "make check". @@ -24,7 +20,7 @@ libNixStore_la_LIBADD = $(top_srcdir)/src/libstore/libstore.la AM_CXXFLAGS = \ -I$(top_srcdir)/src -I$(top_srcdir)/src/libutil -I$(top_srcdir)/src/libstore \ - -I$(shell perl -e 'use Config; print $$Config{archlibexp};')/CORE + -I$(shell $(perl) -e 'use Config; print $$Config{archlibexp};')/CORE lib/Nix/Store.cc: lib/Nix/Store.xs xsubpp $^ -output $@ -- cgit 1.4.1