[singular] 16/19: use /bin/sed, not sed, in build system

felix salfelder felix-guest at moszumanska.debian.org
Mon May 26 13:18:12 UTC 2014


This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository singular.

commit 9979b15239cbbd95b0858fff7254c9eda80783d9
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Sun May 25 13:02:55 2014 +0200

    use /bin/sed, not sed, in build system
    
    Forwarded: not-needed
---
 Singular/Makefile.in | 3 ++-
 doc/Makefile.in      | 5 +++--
 kernel/Makefile.in   | 3 ++-
 mkinstalldirs        | 2 +-
 4 files changed, 8 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/doc/Makefile.in b/doc/Makefile.in
index f3ea4cf..2da78d0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -45,6 +45,7 @@ GZIP            = @MYGZIP@
 UUDECODE        = @UUDECODE@
 
 PERL            = @PERL@
+SED             = /bin/sed
 TEX             = tex
 MAKEINFO        = @MAKEINFO@ --force
 TEXI2PDF        = @TEXI2PDF@
@@ -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