[SCM] an open source computer algebra system branch, master, updated. 99cab34cc0ed9ba9ef7a7aa34a2cb8414d3e2485

[Felix Salfelder]

The following commit has been merged in the master branch:
commit 15a99b08274d1e23a3007263be0dfb0b94d35dff
Author: Felix Salfelder <felix at salfelder.org>
Date:   Wed Mar 20 21:30:38 2013 +0100

    configure factory separately passing a different includedir

diff --git a/debian/rules b/debian/rules
index 579a8f4..cede179 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,12 +104,18 @@ binary-arch: install
 configure-stamp:
 	cp -f /usr/share/misc/config.guess config.guess
 	cp -f /usr/share/misc/config.sub config.sub
-	CFLAGS="$(CFLAGS) -fPIC" \
+	(export CFLAGS="$(CFLAGS) -fPIC" \
 	CXXFLAGS="$(CXXFLAGS) -fPIC" \
 	CPPFLAGS="$(CPPFLAGS) -DMAKE_DISTRIBUTION -I../omalloc -I$(CURDIR)/factory" \
 	LDFLAGS="$(LDFLAGS) -L$(CURDIR)/factory -L$(CURDIR)/libfac -L$(CURDIR)/omalloc" \
-	enable_NTL=no \
-	./configure $(DEB_CONFIGURE_EXTRA_FLAGS)
+	enable_NTL=no; \
+	./configure $(DEB_CONFIGURE_EXTRA_FLAGS); \
+	cd factory; ./configure $(DEB_CONFIGURE_EXTRA_FLAGS) \
+	            --includedir=/usr/include/factory \
+	            --with-Singular=yes \
+	)
+
+
 	# don't look in system directories first:
 	sed 	-e 's#-I/usr/lib/singular-[0-9.-]*\>#-I'"$(CURDIR)"'#g' \
 		-e 's#-I/usr/\(local/\)\?include\( \|$$\)##g' \
@@ -182,7 +188,7 @@ install: build-stamp doc-stamp emacs-stamp
 	dh_testdir
 	dh_testroot
 	dh_prep
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install-libsingular templatedir='$${includedir}/factory/templates'
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install-libsingular
 	$(MAKE) -C Singular DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install
 	$(MAKE) -C doc \
 		bindir="$(CURDIR)/Singular" \

-- 
an open source computer algebra system