[SCM] an open source computer algebra system branch, master, updated. upstream/3-1-3-1-3664-g4d18530
Felix Salfelder
felix at salfelder.org
Wed Feb 8 20:32:23 UTC 2012
The following commit has been merged in the master branch:
commit 3b4105c991625ca87f695fe6830f06aa3b177382
Author: Felix Salfelder <felix at salfelder.org>
Date: Wed Feb 8 20:52:44 2012 +0100
upstream-ready DESTDIR patch
diff --git a/debian/patches/DESTDIR.patch b/debian/patches/DESTDIR.patch
new file mode 100644
index 0000000..fa75b72
--- /dev/null
+++ b/debian/patches/DESTDIR.patch
@@ -0,0 +1,320 @@
+the target 'install-libsingular' is defined twice. this is a bug.
+--- a/omalloc/Makefile.in
++++ b/omalloc/Makefile.in
+@@ -185,17 +185,17 @@
+ $(INSTALL) omalloc.h $(includedir)/singular
+
+ install install-libsingular: all
+- $(MKINSTALLDIRS) $(libdir)
+- $(MKINSTALLDIRS) $(includedir)
+- $(INSTALL_DATA) libomalloc.a $(libdir)
+- $(RANLIB) $(libdir)/libomalloc.a
+- $(INSTALL_DATA) libomalloc_ndebug.a $(libdir)
+- $(RANLIB) $(libdir)/libomalloc_ndebug.a
+- $(INSTALL_DATA) omalloc.o $(libdir)
+- $(INSTALL_DATA) omalloc_debug.o $(libdir)
+- $(INSTALL_DATA) omalloc.h $(includedir)
+- $(INSTALL_DATA) omlimits.h $(includedir)
+- $(INSTALL_DATA) mylimits.h $(includedir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
++ $(INSTALL_DATA) libomalloc.a $(DESTDIR)$(libdir)
++ $(RANLIB) $(DESTDIR)$(libdir)/libomalloc.a
++ $(INSTALL_DATA) libomalloc_ndebug.a $(DESTDIR)$(libdir)
++ $(RANLIB) $(DESTDIR)$(libdir)/libomalloc_ndebug.a
++ $(INSTALL_DATA) omalloc.o $(DESTDIR)$(libdir)
++ $(INSTALL_DATA) omalloc_debug.o $(DESTDIR)$(libdir)
++ $(INSTALL_DATA) omalloc.h $(DESTDIR)$(includedir)
++ $(INSTALL_DATA) omlimits.h $(DESTDIR)$(includedir)
++ $(INSTALL_DATA) mylimits.h $(DESTDIR)$(includedir)
+
+ install_all: install libomalloc_p.a
+ $(INSTALL_DATA) libomalloc_p.a $(libdir)
+--- a/kernel/Makefile.in
++++ b/kernel/Makefile.in
+@@ -48,7 +48,7 @@
+ CFLAGS = @CFLAGS@ ${PIPE}
+ CXXFLAGS = @CXXFLAGS@ ${PIPE}
+ CXXTEMPLFLAGS = @CXXTEMPLFLAGS@
+-CPPFLAGS = -I${srcdir} -I.. -I at prefix@ @CPPFLAGS@
++CPPFLAGS = -I${srcdir} -I.. -I at prefix@ @CPPFLAGS@
+ DEFS = -DNDEBUG -DOM_NDEBUG -D at SING_UNAME@ @DEFS@
+ LDFLAGS = @LDFLAGS@
+ LD_DYN_FLAGS = @LD_DYN_FLAGS@
+@@ -236,7 +236,7 @@
+ -rm -f libkernel.a
+ ar cr $@ $^
+
+-p_Procs_Lib.o: p_Procs_Lib.inc
++p_Procs_Lib.o: p_Procs_Dynamic.inc
+
+ # Hmm compiling with -fomit-frame-pointer resulted in access violation
+ # under cygwin
+@@ -253,12 +253,12 @@
+ p_Procs_Dynamic.inc p_Procs_Lib.inc: p_Procs_Dynamic.h
+
+ # here is how p_Procs_[Static|Dynamic].inc is generated
+-p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h
++p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
+ $(CXX) $(CPPFLAGS) -g -Dp_Procs_Static p_Procs_Generate.cc -o p_Procs_Static
+ ./p_Procs_Static > p_Procs_Static.xx && mv p_Procs_Static.xx p_Procs_Static.inc
+ -rm -f p_Procs_Static p_Procs_Static.exe
+
+-p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h
++p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
+ $(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
+@@ -272,9 +272,9 @@
+ install-nolns: install
+
+ install-libsingular: install
+- -${MKINSTALLDIRS} ${includedir}
+- -${MKINSTALLDIRS} ${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
++ ${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
+
+@@ -290,12 +290,12 @@
+
+
+ installbin: ${DL_LIBS} ${DL_LIBSG} libkernel.a libkernel_g.a
+- ${MKINSTALLDIRS} ${bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
+ - ranlib libkernel.a
+ - ranlib libkernel_g.a
+ ifeq (,${DL_LIBS})
+ else
+- -${INSTALL_PROGRAM} ${DL_LIBS} ${bindir}
++ ${INSTALL_PROGRAM} ${DL_LIBS} $(DESTDIR)${bindir}
+ ifeq (,${DL_LIBSG})
+ else
+ -for file in ${DL_LIBS} ${DL_LIBSG}; do ${INSTALL_PROGRAM} $$file ../Singular; done
+@@ -307,7 +307,7 @@
+ ${MKINSTALLDIRS} ${bindir}
+ ifeq (,${DL_LIBS})
+ else
+- -${INSTALL_PROGRAM} ${DL_LIBS} ${bindir}
++ ${INSTALL_PROGRAM} ${DL_LIBS} $(DESTDIR)${bindir}
+ endif
+
+ ##
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
+@@ -561,50 +561,46 @@
+
+ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+ ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
++ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
+ -for file in *.so; do \
+ ${INSTALL_PROGRAM} $$file ${bindir}; \
+ done
+- ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
+- ${INSTALL_PROGRAM} ESingular TSingular ${bindir}
+- ${INSTALL_PROGRAM} surfex ${bindir}
+- chmod a+x ${SINGULAR}
+- rm -f ${bindir}/${SING_EXEC}${EXEC_EXT}
+- cd ${bindir}; ${LN_S} ${SINGULAR} Singular${EXEC_EXT};
++ ${MKINSTALLDIRS} $(DESTDIR)${install_bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${libdir}
++ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
++ for file in *.so; do \
++ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
++ ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} ESingular TSingular $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} surfex $(DESTDIR)${bindir}
++ chmod a+x $(DESTDIR)${SINGULAR}
++ rm -f $(DESTDIR)${bindir}/${SING_EXEC}${EXEC_EXT}
++ cd $(DESTDIR)${bindir}; ${LN_S} ${SINGULAR} Singular${EXEC_EXT};
+
+-installbin-nolns: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+- ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
+- -for file in *.so; do \
+- ${INSTALL_PROGRAM} $$file ${bindir}; \
+- done
+- ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
+- ${INSTALL_PROGRAM} ESingular TSingular ${DL_LIBS} ${bindir}
+- chmod a+x ${SINGULAR}
+- rm -f ${bindir}/${SING_EXEC}${EXEC_EXT}
+- ${INSTALL_PROGRAM} ${SINGULAR} ${bindir}/Singular${EXEC_EXT};
++installbin-nolns: installbin
++ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${install_bindir}/Singular${EXEC_EXT};
+
+ installslib: LIB
+ test -r ${slibdir} || ${LN_S} `pwd`/LIB ${slibdir}
+
+ installslib-nolns: LIB
+- ${MKINSTALLDIRS} ${slibdir}
++ ${MKINSTALLDIRS} $(DESTDIR)${slibdir}
+ for file in `pwd`/LIB/*.lib; do \
+- ${INSTALL_DATA} $$file ${slibdir}; \
++ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
+ done
+- ${MKINSTALLDIRS} ${slibdir}/gftables
++ ${MKINSTALLDIRS} $(DESTDIR)${slibdir}/gftables
+ for file in `pwd`/LIB/gftables/*; do \
+- ${INSTALL_DATA} $$file ${slibdir}/gftables/; \
++ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
+ done
+
+ install-libsingular: libsingular
+- ${MKINSTALLDIRS} ${includedir}/singular
++ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
+ for file in *.$(SO_SUFFIX); do \
+- ${INSTALL_PROGRAM} $$file ${libdir}; \
++ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
+ done
+- ${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/:<:" >$(DESTDIR)${includedir}/singular/$$file ;\
+ done
+
+ uninstall: uninstallbin
+@@ -654,23 +650,23 @@
+
+ install-bindist: $(HEADERS) $(SOURCES) Makefile depend
+ echo "#define MAKE_DISTRIBUTION " > distrib.h
+- sleep 1
+- ${MAKE} ${SING_EXEC} ESingular TSingular libparse ${RUN_SINGULARS}
+- ${MKINSTALLDIRS} ${install_bindir}
+- ${INSTALL_PROGRAM} ${SING_EXEC} ${install_bindir}/Singular
+- -${INSTALL_PROGRAM} *.so ${install_bindir}
+- ${INSTALL_PROGRAM} -s libparse ${RUN_SINGULARS} ESingular TSingular ${install_bindir}
+- ${INSTALL_PROGRAM} surfex ${install_bindir}
++ # sleep 1
++ ${MAKE} ${SING_EXEC} ESingular TSingular libparse $(DESTDIR)${RUN_SINGULARS}
++ ${MKINSTALLDIRS} $(DESTDIR)${install_bindir}
++ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${install_bindir}/Singular
++ -${INSTALL_PROGRAM} *.so $(DESTDIR)${install_bindir}
++ ${INSTALL_PROGRAM} -s libparse ${RUN_SINGULARS} ESingular TSingular $(DESTDIR)${install_bindir}
++ ${INSTALL_PROGRAM} surfex $(DESTDIR)${install_bindir}
+ echo "#undef MAKE_DISTRIBUTION " > distrib.h
+
+ install-sharedist: ${SLIBS_FILES} LIB/gftables
+- ${MKINSTALLDIRS} ${install_slibdir}
+- cp ${SLIBS_FILES} ${install_slibdir}
+- ${MKINSTALLDIRS} ${install_slibdir}/gftables
+- cp ${GFTABLES} ${install_slibdir}/gftables
+- ${MKINSTALLDIRS} ${install_slibdir}/surfex
+- cp LIB/surfex/surfex.jar ${install_slibdir}/surfex
+- chmod -R +rX ${install_slibdir}/*
++ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}
++ cp ${SLIBS_FILES} $(DESTDIR)${install_slibdir}
++ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}/gftables
++ cp ${GFTABLES} $(DESTDIR)${install_slibdir}/gftables
++ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}/surfex
++ cp LIB/surfex/surfex.jar $(DESTDIR)${install_slibdir}/surfex
++ chmod -R +rX $(DESTDIR)${install_slibdir}/*
+
+ tar:
+ tar cf Singular-${SINGULAR_VERSION}-src.tar ${DISTFILES}
+@@ -768,8 +764,8 @@
+ $(CXXG) ${CXXFLAGSG} ${CPPFLAGS} ${CXXTEMPLFLAGSG} ${DEFSG} -c mpsr_Tok.cc -o mpsr_Tok.og
+
+ installg: Singularg
+- ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} Singularg ${bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} Singularg $(DESTDIR)${bindir}
+
+ ESingularg: mod2.h feOpt.cc version.h emacs.cc \
+ feOptES.inc
+@@ -848,8 +844,8 @@
+ $(CXXP) ${CXXFLAGSP} ${CPPFLAGS} ${CXXTEMPLFLAGSP} ${DEFSP} -c mpsr_Tok.cc -o mpsr_Tok.op
+
+ installp: Singularp
+- ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} Singularp ${bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} Singularp $(DESTDIR)${bindir}
+
+ ##
+ ## dependencies
+--- a/libfac/Makefile.in
++++ b/libfac/Makefile.in
+@@ -147,13 +147,13 @@
+ install-nolns: install
+
+ install install-libsingular: all
+- ${MKINSTALLDIRS} ${includedir}
+- ${MKINSTALLDIRS} ${libdir}
+- ${INSTALL_DATA} ${LIBFACINCLUDE} ${includedir}
+- ${INSTALL_DATA} ${TARGETNAME}.a ${libdir}
+- -${INSTALL_DATA} libsingfac_g.a ${libdir}
+- $(RANLIB) ${libdir}/${TARGETNAME}.a
+- -$(RANLIB) ${libdir}/libsingfac_g.a
++ ${MKINSTALLDIRS} $(DESTDIR)${includedir}
++ ${MKINSTALLDIRS} $(DESTDIR)${libdir}
++ ${INSTALL_DATA} ${LIBFACINCLUDE} $(DESTDIR)${includedir}
++ ${INSTALL_DATA} ${TARGETNAME}.a $(DESTDIR)${libdir}
++ -${INSTALL_DATA} libsingfac_g.a $(DESTDIR)${libdir}
++ $(RANLIB) $(DESTDIR)${libdir}/${TARGETNAME}.a
++ -$(RANLIB) $(DESTDIR)${libdir}/libsingfac_g.a
+
+ install_all: install libsingfac_p.a
+ -${INSTALL_DATA} libsingfac_p.a ${libdir}
+--- a/IntegerProgramming/Makefile.in
++++ b/IntegerProgramming/Makefile.in
+@@ -57,12 +57,12 @@
+ install_all: install
+
+ install install-libsingular: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4) $(LLL)
+- ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} $(MAIN1) ${bindir}
+- ${INSTALL_PROGRAM} $(MAIN2) ${bindir}
+- ${INSTALL_PROGRAM} $(MAIN3) ${bindir}
+- ${INSTALL_PROGRAM} $(MAIN4) ${bindir}
+- ${INSTALL_PROGRAM} $(LLL) ${bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(MAIN1) $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(MAIN2) $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(MAIN3) $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(MAIN4) $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(LLL) $(DESTDIR)${bindir}
+
+ install-bindist: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4)
+ ${MKINSTALLDIRS} ${install_bindir}
+--- a/factory/GNUmakefile.in
++++ b/factory/GNUmakefile.in
+@@ -642,21 +642,22 @@
+ install-nolns: install
+
+ installcf: cf
+- $(MKINSTALLDIRS) $(libdir)
+- $(MKINSTALLDIRS) $(includedir)
+- $(MKINSTALLDIRS) $(templatedir)
+- $(INSTALL_DATA) $(libfactory) $(libdir)/$(libfactory)
+- -$(INSTALL_DATA) libsingcf_g.a $(libdir)/libsingcf_g.a
+- -$(INSTALL_DATA) libsingcf_p.a $(libdir)/libsingcf_p.a
+- $(INSTALL_DATA) factory.h $(includedir)/factory.h
+- $(INSTALL_DATA) cf_gmp.h $(includedir)/cf_gmp.h
+- $(INSTALL_DATA) factoryconf.h $(includedir)/factoryconf.h
+- $(INSTALL_DATA) $(srcdir)/ftmpl_inst.cc $(templatedir)/ftmpl_inst.cc
++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(templatedir)
++ $(INSTALL_DATA) $(libfactory) $(DESTDIR)$(libdir)/$(libfactory)
++ -$(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)/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; \
++ $(INSTALL_DATA) $(srcdir)/templates/$$file $(DESTDIR)$(templatedir)/$$file; \
+ done
+ # we run `ranlib' another time for SUN machines
+- $(RANLIB) $(libdir)/$(libfactory)
++ $(RANLIB) $(DESTDIR)$(libdir)/$(libfactory)
+
+ installmem: mem
+ $(MKINSTALLDIRS) $(libdir)
--
an open source computer algebra system
More information about the debian-science-commits
mailing list