[SCM] an open source computer algebra system branch, master, updated. upstream/3-1-3-1-3664-g4d18530

[Felix Salfelder]

The following commit has been merged in the master branch:
commit c8c2bbc21b6f2eca78f3f070ee1e87a4de68d8e6
Author: Felix Salfelder <felix at salfelder.org>
Date:   Tue Feb 7 20:00:27 2012 +0100

    fix lib install

diff --git a/debian/patches/Singular_make.patch b/debian/patches/Singular_make.patch
index 010e8cf..dde3da8 100644
--- a/debian/patches/Singular_make.patch
+++ b/debian/patches/Singular_make.patch
@@ -129,8 +129,12 @@
  	$(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX  -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
  	./feOptTS
  	rm -f feOptTS feOptTS.exe
-@@ -560,49 +569,41 @@
- install-nolns: all installbin-nolns installslib-nolns
+@@ -557,54 +566,46 @@
+ 
+ install_all: install
+ 
+-install-nolns: all installbin-nolns installslib-nolns
++install-nolns: all installbin-nolns installslib-nolns install-libsingular
  
  installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
 -	${MKINSTALLDIRS} ${bindir}
@@ -188,8 +192,9 @@
 +	  ${INSTALL_DATA}  $$file $(DESTDIR)${slibdir}/gftables/; \
  	done
  
- install-libsingular: libsingular
+-install-libsingular: libsingular
 -	${MKINSTALLDIRS} ${includedir}/singular
++install-libsingular: $(LIBSINGULAR_NAME)
 +	${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
  	for file in *.$(SO_SUFFIX); do \
 -	  ${INSTALL_PROGRAM}  $$file ${libdir}; \
@@ -198,8 +203,11 @@
 -	${INSTALL_PROGRAM} libsingular.h ${includedir}
 +	${INSTALL_PROGRAM} libsingular.h $(DESTDIR)${includedir}
  	for file in subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h; do \
- 	sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >${includedir}/singular/$$file ;\
+-	sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >${includedir}/singular/$$file ;\
++	sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > $(DESTDIR)${includedir}/singular/$$file ;\
  	done
+ 
+ uninstall: uninstallbin
 @@ -620,7 +621,7 @@
  mostlyclean: 
  	-rm -f Singular Singular-static Singularg Singularp libparse feOpt*.inc
diff --git a/debian/patches/kernel_make.patch b/debian/patches/kernel_make.patch
index 40b07f1..42a485b 100644
--- a/debian/patches/kernel_make.patch
+++ b/debian/patches/kernel_make.patch
@@ -34,17 +34,19 @@
  	$(CXX) $(CPPFLAGS) -g -Dp_Procs_Dynamic p_Procs_Generate.cc -o p_Procs_Dynamic
  	./p_Procs_Dynamic > p_Procs_Dynamic.xx && mv p_Procs_Dynamic.xx p_Procs_Dynamic.inc
  	-rm -f p_Procs_Dynamic p_Procs_Dynamic.exe
-@@ -275,8 +276,8 @@
+@@ -275,9 +276,9 @@
  install-nolns: install
  
  install-libsingular: install
 -	-${MKINSTALLDIRS} ${includedir}
 -	-${MKINSTALLDIRS} ${includedir}/singular
-+	-${MKINSTALLDIRS} $(DESTDIR)${includedir}
-+	-${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
- 	-for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > ${includedir}/singular/$$file; done
+-	-for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > ${includedir}/singular/$$file; done
++	${MKINSTALLDIRS} $(DESTDIR)${includedir}
++	${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
++	for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > $(DESTDIR)${includedir}/singular/$$file; done
  
  install: all installbin
+ 
 @@ -293,12 +294,12 @@
  
  
diff --git a/debian/rules b/debian/rules
index 100783d..c5d4c2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += --with-apint=gmp --with-gmp=/usr/lib --disable-NTL
                              --enable-IntegerProgramming --disable-debug --prefix=$(PREFIX) \
                              --exec_prefix=$(PREFIX) --libdir=$(PREFIX)/lib/singular \
                              --libexecdir=$(PREFIX)/lib/singular --bindir=$(PREFIX)/bin \
-                             --includedir=$(PREFIX)/include/singular/ --without-lex \
+                             --includedir=$(PREFIX)/include --without-lex \
                              --without-bison --enable-doc --without-Boost \
                              --with-factory=$(CURDIR)/factory \
                              --with-libfac=$(CURDIR)/libfac \
@@ -163,6 +163,7 @@ install-stamp: build-stamp
 #	dh_testroot
 	dh_prep
 	DESTDIR=$(CURDIR)/debian/tmp/ $(MAKE) $(DEB_MAKE_INVOKE) install-nolns
+	DESTDIR=$(CURDIR)/debian/tmp/ $(MAKE) $(DEB_MAKE_INVOKE) install-libsingular
 	# PREFIX='$(PREFIX)' MAKE='$(MAKE) $(DEB_MAKE_INVOKE) PREFIX="$(PREFIX)"'
 	touch $@
 

-- 
an open source computer algebra system