diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-03 14:09:45 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-03 14:09:45 -0300 |
| commit | 308f6ff034c928c0c4fc2ce168df7192ca2b1209 (patch) | |
| tree | 49603bf604b0d3b3e4e0f1d71d0a52380933aa36 /~emulatorman/icedove-libre/makefile.patch | |
| parent | 99d72f453ab00a43e11f6903bf34d6cd27962a4f (diff) | |
| parent | 964755f48fefde84fce71781d0744e2158f60814 (diff) | |
Merge branch 'master' of vparabola:abslibre
Conflicts:
pcr/pandoc/PKGBUILD
Diffstat (limited to '~emulatorman/icedove-libre/makefile.patch')
| -rw-r--r-- | ~emulatorman/icedove-libre/makefile.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/~emulatorman/icedove-libre/makefile.patch b/~emulatorman/icedove-libre/makefile.patch deleted file mode 100644 index 8f8137bec..000000000 --- a/~emulatorman/icedove-libre/makefile.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Nur comm-release.orig/mail/branding/icedove/Makefile.in comm-release/mail/branding/icedove/Makefile.in ---- comm-release.orig/mail/branding/icedove/Makefile.in 2012-04-18 15:42:15.000000000 -0300 -+++ comm-release/mail/branding/icedove/Makefile.in 2012-05-08 04:03:25.680643202 -0300 -@@ -38,11 +38,11 @@ - # Branding Makefile for Icedove branding - - DEPTH = ../../.. --topsrcdir = ../../../ -+topsrcdir = @top_srcdir@ - srcdir = @srcdir@ - VPATH = @srcdir@ - --include $(topsrcdir)/config/autoconf.mk -+include $(DEPTH)/config/autoconf.mk - - DIRS = \ - locales \ -@@ -50,7 +50,7 @@ - - PREF_JS_EXPORTS += $(srcdir)/thunderbird-branding.js - --include $(DEPTH)/config/rules.mk -+include $(topsrcdir)/config/rules.mk - - export:: - $(NSINSTALL) -D $(DIST)/branding -diff -Nur comm-release.orig/mail/branding/icedove/locales/Makefile.in comm-release/mail/branding/icedove/locales/Makefile.in ---- comm-release.orig/mail/branding/icedove/locales/Makefile.in 2012-04-18 15:42:15.000000000 -0300 -+++ comm-release/mail/branding/icedove/locales/Makefile.in 2012-05-08 05:32:57.481620942 -0300 -@@ -36,13 +36,13 @@ - # ***** END LICENSE BLOCK ***** - - DEPTH = ../../../.. --topsrcdir = ../../../.. -+topsrcdir = @top_srcdir@ - srcdir = @srcdir@ - VPATH = @srcdir@ - relativesrcdir = mail/branding/icedove/locales - --include $(topsrcdir)/config/autoconf.mk -+include $(DEPTH)/config/autoconf.mk - - DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID) - --include $(DEPTH)/config/rules.mk -+include $(topsrcdir)/config/rules.mk |