[singular] 03/06: Use full path for a few coreutils
felix salfelder
felix-guest at moszumanska.debian.org
Mon May 26 07:58:31 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 d080da8185350e25bb38e9994599a784dbb46f70
Author: Julien Puydt <julien.puydt at laposte.net>
Date: Mon May 26 09:43:52 2014 +0200
Use full path for a few coreutils
For some reason quite a few places need /bin/something...
---
Makefile.in | 15 +++++++--------
doc/Makefile.in | 48 +++++++++++++++++++++++++-----------------------
install-sh | 12 ++++++------
mkinstalldirs | 2 +-
4 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index f2eaa65..bd1718d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,6 +21,7 @@ PERL = @PERL@
TMP_DIR = @TMP_DIR@
MYGZIP = @MYGZIP@ -9
GUNZIP = @GUNZIP@
+CHMOD = /bin/chmod
##############################################################
# default target
@@ -53,8 +54,6 @@ install install_all:
if test "$@" = uninstall; then\
echo rm -f doc/$${FILE};\
rm -f doc/$${FILE}; \
- else \
- echo cp ${TEXINFO_TEX_DIR}/$${FILE} doc; \
cp ${TEXINFO_TEX_DIR}/$${FILE} doc; \
fi; \
done;\
@@ -258,7 +257,7 @@ dist: ${SHAREDIST_NAME}.tar.gz ${BINDIST_NAME}.tar.gz
sharedist ${SHAREDIST_NAME}.tar.gz:
if test -d ${SI_TMPDIR}; then rm -rf ${SI_TMPDIR}; fi
${MAKE} install-sharedist localdir=${SI_TMPDIR}
- chmod -R a+rX ${SI_TMPDIR}
+ $(CHMOD) -R a+rX ${SI_TMPDIR}
cd ${SI_TMPDIR}; tar cf - Singular| ${MYGZIP} > ${SHAREDIST_NAME}.tar.gz
mv ${SI_TMPDIR}/${SHAREDIST_NAME}.tar.gz .
rm -rf ${SI_TMPDIR}
@@ -266,7 +265,7 @@ sharedist ${SHAREDIST_NAME}.tar.gz:
bindist ${BINDIST_NAME}.tar.gz:
if test -d ${SI_TMPDIR}; then rm -fr ${SI_TMPDIR}; fi
${MAKE} install-bindist localdir=${SI_TMPDIR}
- chmod -R a+rX ${SI_TMPDIR}
+ $(CHMOD) -R a+rX ${SI_TMPDIR}
cd ${SI_TMPDIR}; tar cf - Singular| ${MYGZIP} > ${BINDIST_NAME}.tar.gz
mv ${SI_TMPDIR}/${BINDIST_NAME}.tar.gz .
rm -rf ${SI_TMPDIR}
@@ -274,7 +273,7 @@ bindist ${BINDIST_NAME}.tar.gz:
static-bindist ${BINDIST_NAME}-static.tar.gz:
if test -d ${SI_TMPDIR}; then rm -fr ${SI_TMPDIR}; fi
${MAKE} install-bindist localdir=${SI_TMPDIR} LD_STATIC=1
- chmod -R a+rX ${SI_TMPDIR}
+ $(CHMOD) -R a+rX ${SI_TMPDIR}
-rm -f ${SI_TMPDIR}/Singular/*/*/*.so
-rm -f ${SI_TMPDIR}/Singular/*/*/modgen*
cd ${SI_TMPDIR}; tar cf - Singular| ${MYGZIP} > ${BINDIST_NAME}-static.tar.gz
@@ -651,7 +650,7 @@ _static-bindist: ${SINGULAR}
-strip ${SI_TMPDIR}/${BINDIR_NAME}/*
cat INSTALL.unix | sed -e "s/<x-y-z>/${S_VERSION}/g" > \
${SI_TMPDIR}/Singular/INSTALL
- cd ${SI_TMPDIR}; chmod -R a+rX *;\
+ cd ${SI_TMPDIR}; $(CHMOD) -R a+rX *;\
tar cf - Singular | ${MYGZIP} > ${BINDIST_NAME}-static.tar.gz
mv ${SI_TMPDIR}/${BINDIST_NAME}-static.tar.gz .
rm -rf ${SI_TMPDIR}
@@ -682,7 +681,7 @@ windist: ${SINGULAR}
${INSTALL} ${CYGWIN_DLL} ${SI_TMPDIR}/${BINDIR_NAME}
cat INSTALL.win | sed -e "s/<x-y-z>/${S_VERSION}/g" > \
${SI_TMPDIR}/Singular/INSTALL
- cd ${SI_TMPDIR}; chmod -R a+rX *;\
+ cd ${SI_TMPDIR}; $(CHMOD) -R a+rX *;\
${ZIP} -r sing Singular
mv ${SI_TMPDIR}/sing.zip Singular-${S_VERSION}-${SINGUNAME}.zip
rm -rf ${SI_TMPDIR}
@@ -695,7 +694,7 @@ srcdist:
touch grammar.cc;\
touch scanner.cc;\
cd ../..;\
- chmod -R a+rX .;\
+ $(CHMOD) -R a+rX .;\
tar cf - Singular-${S_VERSION}| ${MYGZIP} > Singular-${S_VERSION}.tar.gz
mv ${SI_TMPDIR}/Singular-${S_VERSION}.tar.gz .
rm -rf ${SI_TMPDIR}
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 2da78d0..4598a5e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -44,6 +44,8 @@ MKINSTALLDIRS = ../mkinstalldirs
GZIP = @MYGZIP@
UUDECODE = @UUDECODE@
+CP = /bin/cp
+CHMOD = /bin/chmod
PERL = @PERL@
SED = /bin/sed
TEX = tex
@@ -243,7 +245,7 @@ endif
${PERL} ${TEXI2HTML} -init_file t2h_standalone.init -split none -out_file $@ $<
% : %.txt
- cp $< $@
+ $(CP) $< $@
standalone: standalone-txt standalone-html ${STANDALONE_FILES}
@@ -254,15 +256,15 @@ WWW_DIR = /singular/www/2-0/
FTP_DIR = /ftp/pub/Math/Singular/Development
install-standalone: standalone
- cp INSTALL_unix.html COPYING.html INSTALL_win.html ${WWW_DIR}
- cp COPYING COPYING.html ${FTP_DIR}
- cp INSTALL_unix INSTALL_unix.html ${FTP_DIR}
- cp INSTALL_win INSTALL_win.html ${FTP_DIR}
- cp README_ftp.html ${FTP_DIR}/README.html
- cp README_ftp ${FTP_DIR}/README
- cp NEWS.html NEWS ${FTP_DIR}
- cp NEWS.html ${WWW_DIR}
- - chmod g+w ${FTP_DIR}/*
+ $(CP) INSTALL_unix.html COPYING.html INSTALL_win.html ${WWW_DIR}
+ $(CP) COPYING COPYING.html ${FTP_DIR}
+ $(CP) INSTALL_unix INSTALL_unix.html ${FTP_DIR}
+ $(CP) INSTALL_win INSTALL_win.html ${FTP_DIR}
+ $(CP) README_ftp.html ${FTP_DIR}/README.html
+ $(CP) README_ftp ${FTP_DIR}/README
+ $(CP) NEWS.html NEWS ${FTP_DIR}
+ $(CP) NEWS.html ${WWW_DIR}
+ - $(CHMOD) g+w ${FTP_DIR}/*
@@ -297,7 +299,7 @@ images/%.xbm : images/%.xbm.uu
${IMAGES_HTML} : ${IMAGES_SRC}
test -d ${HTML_SUBDIR} || mkdir ${HTML_SUBDIR}
- cp ${IMAGES_SRC} ${HTML_SUBDIR}
+ $(CP) ${IMAGES_SRC} ${HTML_SUBDIR}
###########################################################
# misc targets
@@ -320,13 +322,13 @@ install-sharedist: singular.hlp html singular.idx \
${MKINSTALLDIRS} ${install_prefix}
${MKINSTALLDIRS} ${install_infodir}
${INSTALL_DATA} singular.hlp ${install_infodir}
- chmod -R +rX ${install_infodir}
+ $(CHMOD) -R +rX ${install_infodir}
${MKINSTALLDIRS} ${install_htmldir}
- cp ${HTML_SUBDIR}/*.htm ${install_htmldir}
- cp ${HTML_SUBDIR}/*.gif ${install_htmldir}
- -cp ${HTML_SUBDIR}/*.png ${install_htmldir}
- cp ${HTML_SUBDIR}/*.jpg ${install_htmldir}
- chmod -R +rX ${install_htmldir}
+ $(CP) ${HTML_SUBDIR}/*.htm ${install_htmldir}
+ $(CP) ${HTML_SUBDIR}/*.gif ${install_htmldir}
+ -$(CP) ${HTML_SUBDIR}/*.png ${install_htmldir}
+ $(CP) ${HTML_SUBDIR}/*.jpg ${install_htmldir}
+ $(CHMOD) -R +rX ${install_htmldir}
${MKINSTALLDIRS} ${install_docdir}
${INSTALL_DATA} singular.idx ${install_docdir}
${INSTALL_DATA} ../GPL2 ${install_prefix}/GPL2
@@ -337,15 +339,15 @@ install-sharedist: singular.hlp html singular.idx \
${INSTALL_DATA} NEWS.html ${install_prefix}
${INSTALL_DATA} README_distribution.txt ${install_prefix}/README
${INSTALL_DATA} README_distribution.html ${install_prefix}/README.html
- chmod -R +rX ${install_docdir}
- chmod -R +rX ${install_prefix}
+ $(CHMOD) -R +rX ${install_docdir}
+ $(CHMOD) -R +rX ${install_prefix}
${MKINSTALLDIRS} ${install_exdir}
- cp -R examples ${install_prefix}
+ $(CP) -R examples ${install_prefix}
/bin/rm -f ${install_prefix}/examples/[A-Z]*.res
/bin/rm -f ${install_prefix}/examples/*.res
/bin/rm -f ${install_prefix}/examples/[A-Z]*.inc
/bin/rm -f ${install_prefix}/examples/*.inc
- chmod -R +rX ${install_prefix}/
+ $(CHMOD) -R +rX ${install_prefix}/
# use 'make INSTALL_unix.olaf.txt INSTALL_unix.olaf.html SINGUNAME=olaf'
# to generate these files for uname 'olaf'
@@ -369,9 +371,9 @@ texi2html = $(TEXI2HTML:%.pl=%)
lib2doc.tar.gz:
rm -rf lib2doc lib2doc.tar.gz
mkdir lib2doc
- cp Makefile.lib2doc lib2doc/Makefile
+ $(CP) Makefile.lib2doc lib2doc/Makefile
${MAKEINFO} --no-header --paragraph-indent none -o lib2doc/README lib2doc.texi
- cp pl2doc.pl doc2tex.pl ${texi2html} lib2doc
+ $(CP) pl2doc.pl doc2tex.pl ${texi2html} lib2doc
tar cf lib2doc.tar lib2doc
${GZIP} lib2doc.tar
diff --git a/install-sh b/install-sh
index 6781b98..9d00788 100755
--- a/install-sh
+++ b/install-sh
@@ -59,13 +59,13 @@ fi
# or use environment vars.
chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
+chmodprog=${CHMODPROG-/bin/chmod}
chownprog=${CHOWNPROG-chown}
cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
+cpprog=${CPPROG-/bin/cp}
mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
+mvprog=${MVPROG-/bin/mv}
+rmprog=${RMPROG-/bin/rm}
stripprog=${STRIPPROG-strip}
posix_glob='?'
@@ -447,7 +447,7 @@ do
rmtmp=$dstdir/_rm.$$_
# Trap to clean up those temp files at exit.
- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+ trap 'ret=$?; $(rmprog) -f "$dsttmp" "$rmtmp" && exit $ret' 0
# Copy the file name to the temp name.
(umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
@@ -477,7 +477,7 @@ do
test "$old" = "$new" &&
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
then
- rm -f "$dsttmp"
+ $(rmprog) -f "$dsttmp"
else
# Rename the file to the real destination.
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
diff --git a/mkinstalldirs b/mkinstalldirs
index 80780d0..bd690e1 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -20,7 +20,7 @@ for file in ${1+"$@"} ; do
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp" 1>&2
- mkdir "$pathcomp" || errstatus=$?
+ /bin/mkdir "$pathcomp" || errstatus=$?
fi
pathcomp="$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