Author: eelco
Date: Wed Jan 11 15:41:42 2012
New Revision: 31480
URL: https://nixos.org/websvn/nix/?rev=31480&sc=1
Log:
* Figure out the extension of dynamic libraries; don't hard-code .so.
Modified:
nix/trunk/configure.ac
nix/trunk/perl/Makefile.am
Modified: nix/trunk/configure.ac
==============================================================================
--- nix/trunk/configure.ac Wed Jan 11 14:40:49 2012 (r31479)
+++ nix/trunk/configure.ac Wed Jan 11 15:41:42 2012 (r31480)
@@ -332,6 +332,11 @@
fi
+# Figure out the extension of dynamic libraries.
+eval dynlib_suffix=$shrext_cmds
+AC_SUBST(dynlib_suffix)
+
+
AM_CONFIG_HEADER([config.h])
AC_CONFIG_FILES([Makefile
externals/Makefile
Modified: nix/trunk/perl/Makefile.am
==============================================================================
--- nix/trunk/perl/Makefile.am Wed Jan 11 14:40:49 2012 (r31479)
+++ nix/trunk/perl/Makefile.am Wed Jan 11 15:41:42 2012 (r31480)
@@ -3,13 +3,13 @@
# Hack required by "make check".
all: $(PERL_MODULES:.in=)
mkdir -p lib/auto/Nix/Store
- ln -sfn $(abs_builddir)/.libs/libNixStore.so lib/auto/Nix/Store/Store.so
+ ln -sfn $(abs_builddir)/.libs/libNixStore$(dynlib_suffix)
lib/auto/Nix/Store/Store$(dynlib_suffix)
install-exec-local: $(PERL_MODULES:.in=)
$(INSTALL) -d $(DESTDIR)$(perllibdir)/Nix
$(INSTALL_DATA) $(PERL_MODULES:.in=) $(DESTDIR)$(perllibdir)/Nix
$(INSTALL) -d $(DESTDIR)$(perllibdir)/auto/Nix/Store
- ln -sfn $(pkglibdir)/libNixStore.so
$(DESTDIR)$(perllibdir)/auto/Nix/Store/Store.so
+ ln -sfn $(pkglibdir)/libNixStore$(dynlib_suffix)
$(DESTDIR)$(perllibdir)/auto/Nix/Store/Store$(dynlib_suffix)
# Awful hackery to get libtool to build Perl XS bindings.
pkglib_LTLIBRARIES = libNixStore.la
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
