diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-05 14:32:52 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-05 14:32:52 -0300 |
commit | 2699a201e0f70a2e1c2f7a0cab8725321649893d (patch) | |
tree | b9f1b7eaa65592b658bb922714a975725e244d3c /libre/texlive-bin-libre | |
parent | 8d1750d5bec9ffb69b499a8452d7c2c52cea70e5 (diff) | |
parent | 359d940358dec836dd0acfe9d9caf0b1ff0a97fe (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bacula/PKGBUILD
community/clementine/PKGBUILD
community/dbus-sharp-glib/PKGBUILD
community/dockmanager/PKGBUILD
community/docky/PKGBUILD
community/flightgear-atlas/PKGBUILD
community/libdesktop-agnostic/PKGBUILD
community/openmovieeditor/PKGBUILD
community/perl-crypt-openssl-bignum/PKGBUILD
community/perl-crypt-openssl-random/PKGBUILD
community/perl-crypt-openssl-rsa/PKGBUILD
community/tucan/PKGBUILD
core/btrfs-progs-unstable/PKGBUILD
core/module-init-tools/PKGBUILD
core/sqlite3/PKGBUILD.mips64el
extra/bogofilter/PKGBUILD
extra/dirmngr/PKGBUILD
extra/gluezilla/PKGBUILD
extra/gnupg/PKGBUILD
extra/gnupg2/PKGBUILD
extra/gpgme/PKGBUILD
extra/kdeaccessibility/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdeutils/PKGBUILD
extra/libassuan/PKGBUILD
extra/libksba/PKGBUILD
extra/oxygen-gtk/PKGBUILD
extra/pinentry/PKGBUILD
extra/pth/PKGBUILD
extra/smplayer-themes/PKGBUILD
libre/kdeutils-libre/PKGBUILD
libre/linux-libre/linux-libre.preset.mips64el
Diffstat (limited to 'libre/texlive-bin-libre')
-rw-r--r-- | libre/texlive-bin-libre/archlinux-build.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/libre/texlive-bin-libre/archlinux-build.patch b/libre/texlive-bin-libre/archlinux-build.patch deleted file mode 100644 index accb97a7a..000000000 --- a/libre/texlive-bin-libre/archlinux-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -ur source.old/texk/am/script_links.am source/texk/am/script_links.am ---- source.old/texk/am/script_links.am 2011-05-02 13:54:33.000000000 +0200 -+++ source/texk/am/script_links.am 2011-06-05 11:22:53.118216353 +0200 -@@ -51,8 +51,8 @@ - # We support both multiplatform and non-multiplatform builds. - install-links: - case "$(bindir)" in \ -- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \ -- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \ -+ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) TYPE=$(TYPE) EXT=$(EXT) make-links;; \ -+ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) TYPE=$(TYPE) EXT=$(EXT) make-links;; \ - *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \ - exit 1;; \ - esac -diff -ur source.old/texk/tetex/Makefile.am source/texk/tetex/Makefile.am ---- source.old/texk/tetex/Makefile.am 2011-05-31 11:47:04.000000000 +0200 -+++ source/texk/tetex/Makefile.am 2011-06-05 10:28:40.287025375 +0200 -@@ -35,7 +35,7 @@ - - include $(srcdir)/../am/script_links.am - --texmfdir = ${prefix}/$(scriptsdir) -+texmfdir = $(datadir)/$(scriptsdir) - dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) - - if !WIN32 -diff -ur source.old/texk/texlive/linked_scripts/Makefile.am source/texk/texlive/linked_scripts/Makefile.am ---- source.old/texk/texlive/linked_scripts/Makefile.am 2011-05-31 11:47:04.000000000 +0200 -+++ source/texk/texlive/linked_scripts/Makefile.am 2011-06-05 09:41:50.997250443 +0200 -@@ -165,8 +165,8 @@ - done - else !WIN32 - case "$(bindir)" in \ -- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \ -- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \ -+ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) install-links;; \ -+ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) install-links;; \ - *) echo "strange directory '$(bindir)' for linked scripts" >&2; \ - exit 1;; \ - esac |