[singular] 05/14: Try fixing debian/rules.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master3-sage
in repository singular.

commit 30dc8d04aa5a45b14838aa9404e0f9ab37e95fc4
Author: Tobias Hansen <thansen at debian.org>
Date:   Thu Jul 7 21:00:13 2016 +0000

    Try fixing debian/rules.
---
 debian/rules | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index cbd6324..c9877b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,9 +26,10 @@ WITH_PYTHON = --with-python
 CFLAGS += -Wall
 CXXFLAGS += -Wall
 
-DEB_CONFIGURE_EXTRA_FLAGS += --prefix=/usr/lib/singular-$(VERSION) \
-                             --exec-prefix=/usr/lib/singular-$(VERSION) \
-                             --libdir=/usr/lib \
+DEB_CONFIGURE_EXTRA_FLAGS += --prefix=$(CURDIR)/debian/tmp \
+                             --exec-prefix=$(CURDIR)/debian/tmp \
+                             --bindir=$(CURDIR)/debian/tmp/bin \
+                             --libdir=$(CURDIR)/debian/tmp/lib \
                              --includedir=/usr/include \
                              --with-apint=gmp \
                              --with-factory=$(CURDIR)/factory \
@@ -242,8 +243,8 @@ install: build-stamp doc-stamp emacs-stamp
 	dh_testdir
 	dh_testroot
 	dh_prep
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install-libsingular
-	$(MAKE) -C Singular DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install
+	$(MAKE) DL_LIBSG='' install-libsingular
+	$(MAKE) -C Singular DL_LIBSG='' install
 	$(DOC_TRUE)$(MAKE) -C doc \
 	$(DOC_TRUE)	bindir="$(CURDIR)/Singular" \
 	$(DOC_TRUE)	SINGULAR='$(CURDIR)/Singular/Singular' \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/singular.git