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

[Bernhard R. Link]

The following commit has been merged in the debian branch:
commit de98ade33af20a9fc8e6e2bb8db4a73eaad71dc4
Author: Bernhard R. Link <brlink at debian.org>
Date:   Sat Feb 25 01:05:46 2012 +0100

    use --prefix=/usr/lib/singular-$(VERSION) to get a directory layout more like what singular expects

diff --git a/debian/libsingular-3-1-4.install b/debian/libsingular-3-1-4.install
index f4980b4..198d460 100644
--- a/debian/libsingular-3-1-4.install
+++ b/debian/libsingular-3-1-4.install
@@ -1,5 +1,2 @@
-#usr/bin/*.so usr/lib/singular/
-#usr/lib/*.lib usr/lib/singular/
 usr/lib/libsingular-*.so usr/lib/
-
 usr/lib/singular-* usr/lib/
diff --git a/debian/libsingular-dev.install b/debian/libsingular-dev.install
index da818ba..d7bbc66 100644
--- a/debian/libsingular-dev.install
+++ b/debian/libsingular-dev.install
@@ -1,3 +1,2 @@
 usr/include/ usr/
 usr/lib/libsingular.so usr/lib/
-#usr/lib/singular*.a usr/lib/
diff --git a/debian/rules b/debian/rules
index a8139cb..e6a2476 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,26 +13,18 @@ LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS += -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wextra
 CXXFLAGS += -Wall
 
-PREFIX=/usr
 DEB_CONFIGURE_EXTRA_FLAGS += --with-apint=gmp --with-gmp=/usr/lib --disable-NTL \
                              --without-MP --enable-gmp=/usr/lib \
                              --enable-Singular --enable-factory --enable-libfac \
-                             --enable-IntegerProgramming --disable-debug --prefix=$(PREFIX) \
-                             --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) \
+                             --enable-IntegerProgramming --disable-debug \
+                             --prefix=/usr/lib/singular-$(VERSION) \
+                             --exec-prefix=/usr/lib/singular-$(VERSION) \
+                             --libdir=/usr/lib \
+                             --includedir=/usr/include --without-lex \
                              --without-bison --enable-doc --without-Boost \
                              --with-factory=$(CURDIR)/factory \
                              --with-libfac=$(CURDIR)/libfac
 
-# DEB_MAKE_INVOKE += slibdir=$(PREFIX)/lib/singular-$(VERSION) install_slibdir=$(PREFIX)/lib/singular-$(VERSION)
-
-# DEB_MAKE_BUILD_TARGET = clean
-# DEB_MAKE_CLEAN_TARGET = distclean
-# DEB_MAKE_INSTALL_TARGET = install-nolns
-
 # FIXME:
 DEB_DH_LINK_singular += usr/share/man/man1/Singular.1.gz usr/share/man/man1/ESingular.1.gz
 DEB_DH_LINK_singular += usr/share/man/man1/Singular.1.gz usr/share/man/man1/TSingular.1.gz
@@ -113,7 +105,12 @@ build-indep:
 binary-arch: install
 	dh_testdir
 	dh_testroot
+	dh_installdirs
 	dh_install
+	rm debian/libsingular-$(VERSION)/usr/lib/singular-$(VERSION)/*Singular*
+	ln -sf ../lib/singular-$(VERSION)/Singular debian/singular/usr/bin/
+	ln -sf ../lib/singular-$(VERSION)/TSingular debian/singular/usr/bin/
+	ln -sf ../lib/singular-$(VERSION)/ESingular debian/singular/usr/bin/
 	dh_installchangelogs
 	dh_installexamples
 	dh_installdocs
@@ -139,21 +136,36 @@ configure-stamp:
 	LDFLAGS="$(LDFLAGS) -L$(CURDIR)/factory -L$(CURDIR)/libfac -L$(CURDIR)/omalloc" \
 	enable_NTL=no \
 	./configure $(DEB_CONFIGURE_EXTRA_FLAGS)
+	sed 	-e 's#-I/usr/lib/singular-[0-9.-]*\>##g' \
+		-e 's#-I/usr/\(local/\)\?include\( \|$$\)##g' \
+		-e 's#-I${prefix}\( \|$$\)##g' \
+		-e 's#-L/usr/lib\( \|$$\)##g' \
+		-e 's#-L${libdir}\( \|$$\)##g' \
+		-i \
+		Makefile omalloc/Makefile kernel/Makefile Singular/Makefile \
+		libfac/Makefile factory/GNUmakefile
+	sed -e 's#-I$$(includedir) ##' -i factory/GNUmakefile
 	touch $@
 
 build build-arch: build-stamp
 
 build-stamp: configure-stamp
-	$(MAKE) LIBSINGULAR_LD='$(CXX) $(LDFLAGS) -L../omalloc'
+	$(MAKE) LIBSINGULAR_LD='$(CXX) $(LDFLAGS) -L../omalloc' DL_LIBSG='' GLIBC_DYN_FIX="-lc"
 	touch $@
 
 install: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_prep
-	DESTDIR=$(CURDIR)/debian/tmp/ $(MAKE) $(DEB_MAKE_INVOKE) install
-	# installs more -dev related stuff
-	DESTDIR=$(CURDIR)/debian/tmp/ $(MAKE) $(DEB_MAKE_INVOKE) install-libsingular
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install-libsingular
+	$(MAKE) -C Singular DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install
+	# TODO: 
+	# $(MAKE) -C Singular DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install-sharedist
+	# replace with symlink:
 	ln -sf libsingular-$(VERSION).so debian/tmp/usr/lib/libsingular.so
+	# move as installed to libdir but searched in bindir:
+	mv debian/tmp/usr/lib/dbmsr.so debian/tmp/usr/lib/singular-$(VERSION)/
+	# get rid of AIX specific headers
+	rm debian/tmp/usr/include/*limits.h
 
 .PHONY: build-arch build-indep build install binary-arch binary-indep binary clean
diff --git a/debian/singular.dirs b/debian/singular.dirs
new file mode 100644
index 0000000..415f082
--- /dev/null
+++ b/debian/singular.dirs
@@ -0,0 +1 @@
+/usr/bin
diff --git a/debian/singular.install b/debian/singular.install
index 69a551f..ed8ccfb 100644
--- a/debian/singular.install
+++ b/debian/singular.install
@@ -1,5 +1 @@
-usr/bin/*Singular* /usr/bin
-
-usr/bin/*_* usr/lib/singular
-usr/bin/*lib* usr/lib/singular
-#debian/singular-bin/* /usr/bin
+/usr/lib/singular-*/*Singular*

-- 
an open source computer algebra system