[singular] 02/04: Use /bin/sed everywhere
Julien Puydt
julien.puydt at laposte.net
Sun May 25 19:18:02 UTC 2014
This is an automated email from the git hooks/post-receive script.
jpuydt-guest pushed a commit to branch master
in repository singular.
commit ed33e6cc4264aca699e54bf97fe26dbe15878008
Author: Julien Puydt <julien.puydt at laposte.net>
Date: Sun May 25 20:16:51 2014 +0200
Use /bin/sed everywhere
---
Singular/Makefile.in | 3 +-
debian/patches/0016-use-bin-sed-everywhere.patch | 77 ++++++++++++++++++++++++
debian/patches/series | 1 +
doc/Makefile.in | 5 +-
kernel/Makefile.in | 3 +-
mkinstalldirs | 2 +-
6 files changed, 86 insertions(+), 5 deletions(-)
diff --git a/Singular/Makefile.in b/Singular/Makefile.in
index 23beba4..52de247 100644
--- a/Singular/Makefile.in
+++ b/Singular/Makefile.in
@@ -67,6 +67,7 @@ CC = @CC@
LD = @LD@
CXX = @CXX@
LEX = sh flexer.sh
+SED = /bin/sed
PERL = @PERL@
BISON = bison
@@ -623,7 +624,7 @@ install-libsingular: libsingular
done
${INSTALL_PROGRAM} libsingular.h $(DESTDIR)${includedir}
for file in subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h silink.h table.h sing_dbm.h; do \
- sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >$(DESTDIR)${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
diff --git a/debian/patches/0016-use-bin-sed-everywhere.patch b/debian/patches/0016-use-bin-sed-everywhere.patch
new file mode 100644
index 0000000..7ce4b06
--- /dev/null
+++ b/debian/patches/0016-use-bin-sed-everywhere.patch
@@ -0,0 +1,77 @@
+Description: Use /bin/sed everywhere
+ For some reason, "sed" doesn't work, we need the full path.
+Author: Julien Puydt <julien.puydt at laposte.net>
+Forwarded: not-needed
+
+--- singular-3-1-6.dfsg.orig/Singular/Makefile.in
++++ singular-3-1-6.dfsg/Singular/Makefile.in
+@@ -67,6 +67,7 @@ CC = @CC@
+ LD = @LD@
+ CXX = @CXX@
+ LEX = sh flexer.sh
++SED = /bin/sed
+
+ PERL = @PERL@
+ BISON = bison
+@@ -623,7 +624,7 @@ install-libsingular: libsingular
+ done
+ ${INSTALL_PROGRAM} libsingular.h $(DESTDIR)${includedir}
+ for file in subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h silink.h table.h sing_dbm.h; do \
+- sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >$(DESTDIR)${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
+--- singular-3-1-6.dfsg.orig/doc/Makefile.in
++++ singular-3-1-6.dfsg/doc/Makefile.in
+@@ -43,6 +43,7 @@ INSTALL_DATA = ${INSTALL} -m 644
+ MKINSTALLDIRS = ../mkinstalldirs
+ GZIP = @MYGZIP@
+ UUDECODE = @UUDECODE@
++SED = /bin/sed
+
+ PERL = @PERL@
+ TEX = tex
+@@ -168,10 +169,10 @@ usercard.dvi: usercard.tex singcard.tex
+ ${TEX} $<
+
+ s-plural.tex: plural.tex
+- sed -e "s/BR_PLURAL_BR/(plural)/g" <plural.tex >s-plural.tex
++ $(SED) -e "s/BR_PLURAL_BR/(plural)/g" <plural.tex >s-plural.tex
+
+ s-plulibs.tex: plulibs.tex
+- sed -e "s/BR_PLURAL_BR/(plural)/g" <plulibs.tex >s-plulibs.tex
++ $(SED) -e "s/BR_PLURAL_BR/(plural)/g" <plulibs.tex >s-plulibs.tex
+
+ # postscript stuff
+ ps: dvi manual.ps usercard.ps
+--- singular-3-1-6.dfsg.orig/kernel/Makefile.in
++++ singular-3-1-6.dfsg/kernel/Makefile.in
+@@ -40,6 +40,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = ./mkinstalldirs
+ LN_S = @LN_S@
++SED = /bin/sed
+
+ ##
+ ## compiler and linker options
+@@ -275,7 +276,7 @@ install-nolns: install
+ install-libsingular: install
+ ${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
++ 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
+
+--- singular-3-1-6.dfsg.orig/mkinstalldirs
++++ singular-3-1-6.dfsg/mkinstalldirs
+@@ -8,7 +8,7 @@
+ errstatus=0
+
+ for file in ${1+"$@"} ; do
+- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
++ set fnord `echo ":$file" | /bin/sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ shift
+
+ pathcomp=
diff --git a/debian/patches/series b/debian/patches/series
index e568205..0e050a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
0013-don-t-forget-LDFLAGS-in-module-compilation.patch
0014-fix-mmInit-weirdness.patch
0015-sanitize-cf_gmp.h-generation.patch
+0016-use-bin-sed-everywhere.patch
diff --git a/doc/Makefile.in b/doc/Makefile.in
index f3ea4cf..c06c867 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -43,6 +43,7 @@ INSTALL_DATA = ${INSTALL} -m 644
MKINSTALLDIRS = ../mkinstalldirs
GZIP = @MYGZIP@
UUDECODE = @UUDECODE@
+SED = /bin/sed
PERL = @PERL@
TEX = tex
@@ -168,10 +169,10 @@ usercard.dvi: usercard.tex singcard.tex
${TEX} $<
s-plural.tex: plural.tex
- sed -e "s/BR_PLURAL_BR/(plural)/g" <plural.tex >s-plural.tex
+ $(SED) -e "s/BR_PLURAL_BR/(plural)/g" <plural.tex >s-plural.tex
s-plulibs.tex: plulibs.tex
- sed -e "s/BR_PLURAL_BR/(plural)/g" <plulibs.tex >s-plulibs.tex
+ $(SED) -e "s/BR_PLURAL_BR/(plural)/g" <plulibs.tex >s-plulibs.tex
# postscript stuff
ps: dvi manual.ps usercard.ps
diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index 727364e..4540b31 100644
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -40,6 +40,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = ./mkinstalldirs
LN_S = @LN_S@
+SED = /bin/sed
##
## compiler and linker options
@@ -275,7 +276,7 @@ install-nolns: install
install-libsingular: install
${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
+ 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
diff --git a/mkinstalldirs b/mkinstalldirs
index 91f6d04..80780d0 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -8,7 +8,7 @@
errstatus=0
for file in ${1+"$@"} ; do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ set fnord `echo ":$file" | /bin/sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
pathcomp=
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/singular.git
More information about the debian-science-commits
mailing list