Blob Blame History Raw
diff -up Singular-3-1-5/doc/Makefile.in.orig Singular-3-1-5/doc/Makefile.in
--- Singular-3-1-5/doc/Makefile.in.orig	2012-08-04 17:53:14.240198555 -0400
+++ Singular-3-1-5/doc/Makefile.in	2012-08-04 17:53:40.830199591 -0400
@@ -69,7 +69,7 @@ EX_SUBDIR       = ./examples
 CHKSUM_DB       = ${DOC_SUBDIR}/chksum
 DOC2TEX_EXAMPLE_EXCLUSIONS = @DOC2TEX_EXAMPLE_EXCLUSIONS@
 DOC2TEX         = ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
-                  -Singular ${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
+                  -Singular $(DESTDIR)${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
 		  -exdir ${EX_SUBDIR} ${DOC2TEX_EXAMPLE_EXCLUSIONS}
 TAG		=
 PL2DOC		= ${PERL} ./pl2doc.pl ${TAG} -db ${CHKSUM_DB}
diff -up Singular-3-1-5/factory/GNUmakefile.in.orig Singular-3-1-5/factory/GNUmakefile.in
--- Singular-3-1-5/factory/GNUmakefile.in.orig	2012-08-04 17:44:00.336177355 -0400
+++ Singular-3-1-5/factory/GNUmakefile.in	2012-08-04 17:45:36.070180901 -0400
@@ -538,45 +538,45 @@ installtest:	test_install
 install install-libsingular:	$(installtargets) cf_gmp.h
 
 install_all:    install libsingcf_p.a 
-		-$(INSTALL_DATA) libsingcf_p.a $(libdir)/libsingcf_p.a 
+		-$(INSTALL_DATA) libsingcf_p.a $(DESTDIR)$(libdir)/libsingcf_p.a 
 
 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)/cf_gmp.h
+		$(INSTALL_DATA) factoryconf.h $(DESTDIR)$(includedir)/factoryconf.h
+		$(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)
-		$(INSTALL_DATA) libcfmem.a $(libdir)/libcfmem.a
+		$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+		$(INSTALL_DATA) libcfmem.a $(DESTDIR)$(libdir)/libcfmem.a
 # once again: another run for SUN
-		$(RANLIB) $(libdir)/libcfmem.a
+		$(RANLIB) $(DESTDIR)$(libdir)/libcfmem.a
 
 # to a pity, this cannot be done automatically ...
 installgftables:
 		@echo "Copying GF(q) tables ..."
 		@if test -d gftables; then \
-		  $(MKINSTALLDIRS) $(gftabledir); \
+		  $(MKINSTALLDIRS) $(DESTDIR)$(gftabledir); \
 		  for file in gftables/gftable.*.*; do \
-		    $(INSTALL_DATA) $$file $(gftabledir); \
+		    $(INSTALL_DATA) $$file $(DESTDIR)$(gftabledir); \
 		  done \
 		elif test -d "$(srcdir)"/gftables; then \
-		  $(MKINSTALLDIRS) $(gftabledir); \
+		  $(MKINSTALLDIRS) $(DESTDIR)$(gftabledir); \
 		  for file in "$(srcdir)"/gftables/gftable.*.*; do \
-		    $(INSTALL_DATA) $$file $(gftabledir); \
+		    $(INSTALL_DATA) $$file $(DESTDIR)$(gftabledir); \
 		  done \
 		else \
 		  echo "Run 'make gftables' before installing them"; \
diff -up Singular-3-1-5/IntegerProgramming/Makefile.in.orig Singular-3-1-5/IntegerProgramming/Makefile.in
--- Singular-3-1-5/IntegerProgramming/Makefile.in.orig	2012-08-04 17:45:51.672181624 -0400
+++ Singular-3-1-5/IntegerProgramming/Makefile.in	2012-08-04 17:46:23.150182791 -0400
@@ -63,12 +63,12 @@ install-nolns: install
 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}
diff -up Singular-3-1-5/kernel/Makefile.in.orig Singular-3-1-5/kernel/Makefile.in
--- Singular-3-1-5/kernel/Makefile.in.orig	2012-08-04 17:46:35.296183272 -0400
+++ Singular-3-1-5/kernel/Makefile.in	2012-08-04 17:47:29.206185420 -0400
@@ -272,9 +272,9 @@ p_Procs_%.so: p_Procs_Lib_%.dl_o
 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 @@ endif
 
 
 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
@@ -304,10 +304,10 @@ endif
 
 
 install-bindist: ${DL_LIBS} libkernel.a
-	${MKINSTALLDIRS} ${bindir}
+	${MKINSTALLDIRS} $(DESTDIR)${bindir}
 ifeq (,${DL_LIBS})
 else
-	-${INSTALL_PROGRAM} ${DL_LIBS} ${bindir}
+	-${INSTALL_PROGRAM} ${DL_LIBS} $(DESTDIR)${bindir}
 endif
 
 ##
diff -up Singular-3-1-5/libfac/Makefile.in.orig Singular-3-1-5/libfac/Makefile.in
--- Singular-3-1-5/libfac/Makefile.in.orig	2012-08-04 17:47:48.648185997 -0400
+++ Singular-3-1-5/libfac/Makefile.in	2012-08-04 17:48:21.678187215 -0400
@@ -146,17 +146,17 @@ libsingfac_p.a:	$(PROFOBJ)
 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}
-	-$(RANLIB) ${libdir}/libsingfac_p.a
+	-${INSTALL_DATA} libsingfac_p.a $(DESTDIR)${libdir}
+	-$(RANLIB) $(DESTDIR)${libdir}/libsingfac_p.a
 
 uninstall: 
 	$(RM) ${includedir}/${LIBFACINCLUDE}
diff -up Singular-3-1-5/omalloc/Makefile.in.orig Singular-3-1-5/omalloc/Makefile.in
--- Singular-3-1-5/omalloc/Makefile.in.orig	2012-08-04 17:48:32.312187774 -0400
+++ Singular-3-1-5/omalloc/Makefile.in	2012-08-04 17:49:24.342189747 -0400
@@ -181,35 +181,35 @@ configure: configure.in
 install-nolns: install
 
 install-libsingular:
-	$(MKINSTALLDIRS) $(includedir)/singular
-	$(INSTALL) omalloc.h $(includedir)/singular
+	$(MKINSTALLDIRS) $(DESTDIR)$(includedir)/singular
+	$(INSTALL) omalloc.h $(DESTDIR)$(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)
-	$(RANLIB) $(libdir)/libomalloc_p.a
+	$(INSTALL_DATA) libomalloc_p.a $(DESTDIR)$(libdir)
+	$(RANLIB) $(DESTDIR)$(libdir)/libomalloc_p.a
 
 install_min: libomalloc_ndebug.a omalloc.o
-	$(MKINSTALLDIRS) $(libdir)
-	$(MKINSTALLDIRS) $(includedir)
-	$(INSTALL_DATA) libomalloc_ndebug.a $(libdir)
-	$(RANLIB) $(libdir)/libomalloc_ndebug.a
-	$(INSTALL_DATA) omalloc.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_ndebug.a $(DESTDIR)$(libdir)
+	$(RANLIB) $(DESTDIR)$(libdir)/libomalloc_ndebug.a
+	$(INSTALL_DATA) omalloc.o $(DESTDIR)$(libdir)
+	$(INSTALL_DATA) omalloc.h $(DESTDIR)$(includedir)
+	$(INSTALL_DATA) omlimits.h $(DESTDIR)$(includedir)
+	$(INSTALL_DATA) mylimits.h $(DESTDIR)$(includedir)
 
 uninstall:
 	rm -f $(includedir)/omalloc.h
diff -up Singular-3-1-5/Singular/Makefile.in.orig Singular-3-1-5/Singular/Makefile.in
--- Singular-3-1-5/Singular/Makefile.in.orig	2012-08-04 17:49:36.816190217 -0400
+++ Singular-3-1-5/Singular/Makefile.in	2012-08-04 17:53:01.190198060 -0400
@@ -556,51 +556,51 @@ install_all: install
 install-nolns: all installbin-nolns installslib-nolns
 
 installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
-	${MKINSTALLDIRS} ${bindir}
-	${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
+	${MKINSTALLDIRS} $(DESTDIR)${bindir}
+	${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
 	-for file in *.so; do \
-	  ${INSTALL_PROGRAM} $$file ${bindir}; \
+	  ${INSTALL_PROGRAM} $$file $(DESTDIR)${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};
+	${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}
+	${MKINSTALLDIRS} $(DESTDIR)${bindir}
+	${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
 	-for file in *.so; do \
-	  ${INSTALL_PROGRAM} $$file ${bindir}; \
+	  ${INSTALL_PROGRAM} $$file $(DESTDIR)${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};
+	${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} $(DESTDIR)${bindir}
+	${INSTALL_PROGRAM} ESingular TSingular ${DL_LIBS} $(DESTDIR)${bindir}
+	chmod a+x $(DESTDIR)${SINGULAR}
+	rm -f $(DESTDIR)${bindir}/${SING_EXEC}${EXEC_EXT}
+	${INSTALL_PROGRAM} ${SINGULAR} $(DESTDIR)${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}/gftables/; \
 	done
 
 install-libsingular: libsingular installslib-nolns
-	${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