[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 e3c15f725028a154aff9e3340ee69dcd989b7526
Author: Felix Salfelder <felix at salfelder.org>
Date:   Tue Feb 7 22:55:48 2012 +0100

    factory header install fix

diff --git a/debian/patches/factory_make.patch b/debian/patches/factory_make.patch
index 130c364..800d08a 100644
--- a/debian/patches/factory_make.patch
+++ b/debian/patches/factory_make.patch
@@ -32,7 +32,7 @@ e.g. factoryconf.h, config.h is generated during configure
  	echo $*.d "\\" > $@
  	$(CXX) -MM $< $(DEPCXXFLAGS) >> $@
  %.dtmp: %.template
-@@ -640,21 +640,21 @@
+@@ -640,21 +640,22 @@
  install-nolns: install
  
  installcf:	cf
@@ -53,8 +53,9 @@ e.g. factoryconf.h, config.h is generated during configure
 +		-$(INSTALL_DATA) libsingcf_g.a $(DESTDIR)$(libdir)/libsingcf_g.a
 +		-$(INSTALL_DATA) libsingcf_p.a $(DESTDIR)$(libdir)/libsingcf_p.a
 +		$(INSTALL_DATA) factory.h $(DESTDIR)$(includedir)/factory.h
-+		$(INSTALL_DATA) cf_gmp.h $(DESTDIR)$(includedir)/cf_gmp.h
-+		$(INSTALL_DATA) factoryconf.h $(DESTDIR)$(includedir)/factoryconf.h
++		$(INSTALL_DATA) cf_gmp.h $(DESTDIR)$(includedir)/factory/cf_gmp.h
++		$(INSTALL_DATA) factoryconf.h $(DESTDIR)$(includedir)/factory/factoryconf.h
++		# FIXME: what is templatedir?
 +		$(INSTALL_DATA) $(srcdir)/ftmpl_inst.cc $(DESTDIR)$(templatedir)/ftmpl_inst.cc
  		for file in $(templatesrc) $(templateincl); do \
 -		  $(INSTALL_DATA) $(srcdir)/templates/$$file $(templatedir)/$$file; \
@@ -66,7 +67,7 @@ e.g. factoryconf.h, config.h is generated during configure
  
  installmem:	mem
  		$(MKINSTALLDIRS) $(libdir)
-@@ -780,8 +780,10 @@
+@@ -780,8 +781,10 @@
  # seems gmake needs at least a trivial command.  otherwise all
  # files which depend on config.h will be remade even if congig.h
  # did not change.
@@ -79,7 +80,7 @@ e.g. factoryconf.h, config.h is generated during configure
  
  stamp-h:	config.h.in config.status
  		CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
-@@ -797,7 +799,7 @@
+@@ -797,7 +800,7 @@
  		./config.status --recheck
  
  # create cf_gmp.h

-- 
an open source computer algebra system