From aab88127321344d5818d823bff515d127108d058 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon, 4 Sep 2006 15:12:24 +0000
Subject: [PATCH] * Store the Nix libraries in ${libdir}/nix instead of
 ${libdir}.

---
 configure.ac                 | 1 +
 src/boost/format/Makefile.am | 2 +-
 src/libexpr/Makefile.am      | 2 +-
 src/libmain/Makefile.am      | 2 +-
 src/libstore/Makefile.am     | 2 +-
 src/libutil/Makefile.am      | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index b14fa7e08..add3a5bc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,7 @@ AC_PROG_CXX
 
 # We are going to use libtool.
 AC_DISABLE_STATIC
+AC_ENABLE_SHARED
 AC_PROG_LIBTOOL
 
 
diff --git a/src/boost/format/Makefile.am b/src/boost/format/Makefile.am
index eb4d7dee8..39bc6fe07 100644
--- a/src/boost/format/Makefile.am
+++ b/src/boost/format/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libformat.la
+pkglib_LTLIBRARIES = libformat.la
 
 libformat_la_SOURCES = format_implementation.cc free_funcs.cc \
  parsing.cc exceptions.hpp feed_args.hpp format_class.hpp \
diff --git a/src/libexpr/Makefile.am b/src/libexpr/Makefile.am
index 81c851fb0..f08504259 100644
--- a/src/libexpr/Makefile.am
+++ b/src/libexpr/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libexpr.la
+pkglib_LTLIBRARIES = libexpr.la
 
 libexpr_la_SOURCES = nixexpr.cc nixexpr.hh parser.cc parser.hh \
  eval.cc eval.hh primops.cc \
diff --git a/src/libmain/Makefile.am b/src/libmain/Makefile.am
index ebf64a2fb..7df4f4b05 100644
--- a/src/libmain/Makefile.am
+++ b/src/libmain/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libmain.la
+pkglib_LTLIBRARIES = libmain.la
 
 libmain_la_SOURCES = shared.cc shared.hh
 
diff --git a/src/libstore/Makefile.am b/src/libstore/Makefile.am
index c79830d8a..3730ae5b2 100644
--- a/src/libstore/Makefile.am
+++ b/src/libstore/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libstore.la
+pkglib_LTLIBRARIES = libstore.la
 
 libstore_la_SOURCES = \
  store.cc store.hh derivations.cc derivations.hh \
diff --git a/src/libutil/Makefile.am b/src/libutil/Makefile.am
index 513d8ecf5..7798ac2bb 100644
--- a/src/libutil/Makefile.am
+++ b/src/libutil/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libutil.la
+pkglib_LTLIBRARIES = libutil.la
 
 libutil_la_SOURCES = util.cc util.hh hash.cc hash.hh \
  archive.cc archive.hh aterm.cc aterm.hh \