[SCM] an open source computer algebra system branch, debian, updated. 6a34a75aa3a06dc2b2117624199f1f5c3cf4a1cf

[Felix Salfelder]

The following commit has been merged in the debian branch:
commit 14a19861fee8e0dba64fe00d2822fd7521318fa3
Author: Felix Salfelder <felix at salfelder.org>
Date:   Tue Feb 21 21:43:54 2012 +0100

    add --with-install-slibdir and --with-slibdir to configure options
    
     - this should set -DSLIBDIR for kernel/feResources.cc and cause make
       install to use correct paths
     - now take things from /usr/lib, not /usr/share in
       libsingular-*.install

diff --git a/debian/libsingular-3-1-4.install b/debian/libsingular-3-1-4.install
index 2688c63..f4980b4 100644
--- a/debian/libsingular-3-1-4.install
+++ b/debian/libsingular-3-1-4.install
@@ -2,5 +2,4 @@
 #usr/lib/*.lib usr/lib/singular/
 usr/lib/libsingular-*.so usr/lib/
 
-#seems too specific to put in share
-usr/share/singular/* usr/lib/singular/
+usr/lib/singular-* usr/lib/
diff --git a/debian/rules b/debian/rules
index 1d4c119..a4bc45f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,11 +21,13 @@ DEB_CONFIGURE_EXTRA_FLAGS += --with-apint=gmp --with-gmp=/usr/lib --disable-NTL
                              --exec_prefix=$(PREFIX) --libdir=$(PREFIX)/lib \
                              --libexecdir=$(PREFIX)/lib --bindir=$(PREFIX)/bin \
                              --includedir=$(PREFIX)/include --without-lex \
+                             --with-install-slibdir=$(PREFIX)/lib/singular-$(VERSION) \
+                             --with-slibdir=$(PREFIX)/lib/singular-$(VERSION) \
                              --without-bison --enable-doc --without-Boost \
                              --with-factory=$(CURDIR)/factory \
                              --with-libfac=$(CURDIR)/libfac
 
-DEB_MAKE_INVOKE += slibdir=$(PREFIX)/share/singular install_slibdir=$(PREFIX)/share/singular
+# DEB_MAKE_INVOKE += slibdir=$(PREFIX)/lib/singular-$(VERSION) install_slibdir=$(PREFIX)/lib/singular-$(VERSION)
 
 # DEB_MAKE_BUILD_TARGET = clean
 # DEB_MAKE_CLEAN_TARGET = distclean

-- 
an open source computer algebra system