Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-texlive grimoire by Finn Haedicke (da3123c502dbbc3766f32fc4cabb138927494611)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Finn Haedicke <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-texlive grimoire by Finn Haedicke (da3123c502dbbc3766f32fc4cabb138927494611)
  • Date: Tue, 10 Nov 2009 09:58:45 -0600

GIT changes to devel-texlive grimoire by Finn Haedicke
<finn_haedicke AT gmx.net>:

latex/texlive/fix_scripts_3.patch | 40
+++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)

New commits:
commit da3123c502dbbc3766f32fc4cabb138927494611
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn_haedicke AT gmx.net>

texlive: updated patch

* to install working symlinks
* to skip overwriting /usr/bin/man

diff --git a/latex/texlive/fix_scripts_3.patch
b/latex/texlive/fix_scripts_3.patch
index 74f04bf..26f8189 100644
--- a/latex/texlive/fix_scripts_3.patch
+++ b/latex/texlive/fix_scripts_3.patch
@@ -154,7 +154,7 @@ diff -ru texlive-20091107-source/texk/tetex/Makefile.in
tl/texk/tetex/Makefile.i
doc/TETEXDOC.bib doc/TETEXDOC.tex fontinst.bat pdfetex-pl.pool \
diff -ru texlive-20091107-source/texk/tex4htk/Makefile.in
tl/texk/tex4htk/Makefile.in
--- texlive-20091107-source/texk/tex4htk/Makefile.in 2009-11-10
07:51:56.104901674 +0100
-+++ tl/texk/tex4htk/Makefile.in 2009-11-10 10:09:16.655391593 +0100
++++ tl/texk/tex4htk/Makefile.in 2009-11-10 16:10:41.826690047 +0100
@@ -273,7 +273,7 @@
xhlatex xhmcontext xhmex xhmlatex xhmmex xhmtex xhmtexi \
xhmxelatex xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java
@@ -164,10 +164,20 @@ diff -ru
texlive-20091107-source/texk/tex4htk/Makefile.in tl/texk/tex4htk/Makefi
tex4ht_SCRIPTS =
bin_SCRIPTS =
all: c-auto.h
-Nur in tl/texk/tex4htk: .Makefile.in.swp.
+@@ -833,8 +833,8 @@
+ $(INSTALL_SCRIPT) $(srcdir)/$$p "$(DESTDIR)$(tex4htdir)/$$p.sh"; \
+ done
+ case "$(bindir)" in \
+- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
++ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=../share install-links;; \
++ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../../share install-links;; \
+ *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+ exit 1;; \
+ esac
diff -ru texlive-20091107-source/texk/texlive/linked_scripts/Makefile.in
tl/texk/texlive/linked_scripts/Makefile.in
--- texlive-20091107-source/texk/texlive/linked_scripts/Makefile.in
2009-11-10 07:51:55.952902523 +0100
-+++ tl/texk/texlive/linked_scripts/Makefile.in 2009-11-10 09:35:30.862879772
+0100
++++ tl/texk/texlive/linked_scripts/Makefile.in 2009-11-10 16:36:12.771395316
+0100
@@ -156,7 +156,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -186,8 +196,28 @@ diff -ru
texlive-20091107-source/texk/texlive/linked_scripts/Makefile.in tl/texk
nobase_dist_script_SCRIPTS = \
accfonts/mkt1font \
accfonts/vpl2ovp \
-Nur in tl/texk/web2c/am: .texmf.am.swp.
-Nur in tl/texk/web2c: .Makefile.in.swp.
+@@ -542,8 +542,8 @@
+
+ install-data-hook:
+ case "$(bindir)" in \
+- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
++ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=../share install-links;; \
++ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../../share install-links;; \
+ *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+ exit 1;; \
+ esac
+@@ -574,9 +574,7 @@
+ rm -f getnonfreefonts-sys && \
+ echo "creating link 'getnonfreefonts-sys' -> 'getnonfreefonts'" && \
+ $(LN_S) getnonfreefonts getnonfreefonts-sys && \
+- rm -f man && \
+- echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
+- (ln -s $(REL)/texmf/doc/man man || :)
++ true
+
+ uninstall-hook:
+ @for s in $(nobase_dist_scriptx_SCRIPTS)
$(nobase_dist_script_SCRIPTS); do \
diff -ru texlive-20091107-source/texk/xdvik/Makefile.in
tl/texk/xdvik/Makefile.in
--- texlive-20091107-source/texk/xdvik/Makefile.in 2009-11-10
07:51:56.084902344 +0100
+++ tl/texk/xdvik/Makefile.in 2009-11-10 09:35:48.058678814 +0100



  • [SM-Commit] GIT changes to devel-texlive grimoire by Finn Haedicke (da3123c502dbbc3766f32fc4cabb138927494611), Finn Haedicke, 11/10/2009

Archive powered by MHonArc 2.6.24.

Top of Page