about summary refs log tree commit diff
path: root/perl
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2012-01-05T20·33+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2012-01-05T20·33+0000
commita7366a764aa8d549a16b58e43181fe4ff7e598ab (patch)
tree9f6b1b1029fef06b5515ae1b23675811d9989dca /perl
parentb52966e821b05e0d2e379ed6bbbf748f22453108 (diff)
* 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.

Diffstat (limited to 'perl')
-rw-r--r--perl/Makefile.am6
1 files changed, 1 insertions, 5 deletions
diff --git a/perl/Makefile.am b/perl/Makefile.am
index ccb08b447b..12293fc050 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 $@