[SCM] an open source computer algebra system branch, debian, updated. 3f1c419ac4981d4babdd737ac18bd16c080a761a

[Bernhard R. Link]

The following commit has been merged in the debian branch:
commit cbf2af57c74210488934111a54caf2940bde79e8
Author: Bernhard R. Link <brlink at debian.org>
Date:   Sat Mar 3 14:25:21 2012 +0100

    make building docs work without singular already installed

diff --git a/debian/rules b/debian/rules
index 5d670b8..2572b6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -165,10 +165,12 @@ build-stamp: configure-stamp
 	$(MAKE) -C Singular libparse
 	cd Singular && ln -sf ../kernel/p_*.so .
 	SINGULAR_BIN_DIR=$(CURDIR)/Singular \
+	 LD_LIBRARY_PATH='$(CURDIR)/Singular' \
 	 PATH="$(CURDIR)/Singular:$(CURDIR)/kernel:$(CURDIR)/IntegerProgramming:$$PATH" \
 	 $(MAKE) \
 		DOC2TEX_EXAMPLE_EXCLUSIONS="$(EXAMPLE_EXCLUDE)" \
 		bindir="$(CURDIR)/Singular" \
+		SINGULAR='$(CURDIR)/Singular/Singular' \
 		-C doc \
 		standalone-txt standalone-html html singular.idx singular.hlp
 	touch $@
@@ -181,7 +183,11 @@ install: build-stamp
 	$(MAKE) -C Singular DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install
 	# TODO: 
 	# $(MAKE) -C Singular DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install-sharedist
-	$(MAKE) -C doc install-sharedist install_prefix=$(CURDIR)/debian/tmp/usr/share/singular-$(VERSION)
+	$(MAKE) -C doc \
+		bindir="$(CURDIR)/Singular" \
+		SINGULAR='$(CURDIR)/Singular/Singular' \
+		install_prefix=$(CURDIR)/debian/tmp/usr/share/singular-$(VERSION) \
+		install-sharedist
 	# replace with symlink:
 	ln -sf libsingular-$(VERSION).so debian/tmp/usr/lib/libsingular.so
 	# surfex is not included due to missing sources, so do not install wrappers, either:

-- 
an open source computer algebra system