[singular] 05/06: revert non-debian changes in debian branch
felix salfelder
felix-guest at moszumanska.debian.org
Mon May 26 07:58:32 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 cea338b9f693a11959cd88a764a6a5656a3f674e
Author: Felix Salfelder <felix at salfelder.org>
Date: Mon May 26 09:51:50 2014 +0200
revert non-debian changes in debian branch
---
Makefile.in | 15 ++++++++-------
Singular/Makefile.in | 3 +--
doc/Makefile.in | 52 +++++++++++++++++++++++++---------------------------
install-sh | 12 ++++++------
kernel/Makefile.in | 3 +--
mkinstalldirs | 4 ++--
6 files changed, 43 insertions(+), 46 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index bd1718d..f2eaa65 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,7 +21,6 @@ PERL = @PERL@
TMP_DIR = @TMP_DIR@
MYGZIP = @MYGZIP@ -9
GUNZIP = @GUNZIP@
-CHMOD = /bin/chmod
##############################################################
# default target
@@ -54,6 +53,8 @@ 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;\
@@ -257,7 +258,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}
@@ -265,7 +266,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}
@@ -273,7 +274,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
@@ -650,7 +651,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}
@@ -681,7 +682,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}
@@ -694,7 +695,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/Singular/Makefile.in b/Singular/Makefile.in
index 52de247..23beba4 100644
--- a/Singular/Makefile.in
+++ b/Singular/Makefile.in
@@ -67,7 +67,6 @@ CC = @CC@
LD = @LD@
CXX = @CXX@
LEX = sh flexer.sh
-SED = /bin/sed
PERL = @PERL@
BISON = bison
@@ -624,7 +623,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 0d1ee2f..2da78d0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -43,11 +43,9 @@ INSTALL_DATA = ${INSTALL} -m 644
MKINSTALLDIRS = ../mkinstalldirs
GZIP = @MYGZIP@
UUDECODE = @UUDECODE@
-SED = /bin/sed
-CP = /bin/cp
-CHMOD = /bin/chmod
PERL = @PERL@
+SED = /bin/sed
TEX = tex
MAKEINFO = @MAKEINFO@ --force
TEXI2PDF = @TEXI2PDF@
@@ -71,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 /bin/true -verbose ${VERBOSE} -make ${MAKE} \
+ -Singular ${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
-exdir ${EX_SUBDIR} ${DOC2TEX_EXAMPLE_EXCLUSIONS}
TAG =
PL2DOC = ${PERL} ./pl2doc.pl ${TAG} -db ${CHKSUM_DB}
@@ -245,7 +243,7 @@ endif
${PERL} ${TEXI2HTML} -init_file t2h_standalone.init -split none -out_file $@ $<
% : %.txt
- $(CP) $< $@
+ cp $< $@
standalone: standalone-txt standalone-html ${STANDALONE_FILES}
@@ -256,15 +254,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}/*
@@ -299,7 +297,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
@@ -322,13 +320,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
@@ -339,15 +337,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'
@@ -371,9 +369,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 9d00788..6781b98 100755
--- a/install-sh
+++ b/install-sh
@@ -59,13 +59,13 @@ fi
# or use environment vars.
chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-/bin/chmod}
+chmodprog=${CHMODPROG-chmod}
chownprog=${CHOWNPROG-chown}
cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-/bin/cp}
+cpprog=${CPPROG-cp}
mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-/bin/mv}
-rmprog=${RMPROG-/bin/rm}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-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=$?; $(rmprog) -f "$dsttmp" "$rmtmp" && exit $ret' 0
+ trap 'ret=$?; rm -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
- $(rmprog) -f "$dsttmp"
+ rm -f "$dsttmp"
else
# Rename the file to the real destination.
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index 4540b31..727364e 100644
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -40,7 +40,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = ./mkinstalldirs
LN_S = @LN_S@
-SED = /bin/sed
##
## compiler and linker options
@@ -276,7 +275,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 bd690e1..91f6d04 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -8,7 +8,7 @@
errstatus=0
for file in ${1+"$@"} ; do
- set fnord `echo ":$file" | /bin/sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
pathcomp=
@@ -20,7 +20,7 @@ for file in ${1+"$@"} ; do
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp" 1>&2
- /bin/mkdir "$pathcomp" || errstatus=$?
+ 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