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/iceweasel-libre/iceweasel-install-dir.patch | |
parent | 99d72f453ab00a43e11f6903bf34d6cd27962a4f (diff) | |
parent | 964755f48fefde84fce71781d0744e2158f60814 (diff) |
Merge branch 'master' of vparabola:abslibre
Conflicts:
pcr/pandoc/PKGBUILD
Diffstat (limited to '~emulatorman/iceweasel-libre/iceweasel-install-dir.patch')
-rw-r--r-- | ~emulatorman/iceweasel-libre/iceweasel-install-dir.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/~emulatorman/iceweasel-libre/iceweasel-install-dir.patch b/~emulatorman/iceweasel-libre/iceweasel-install-dir.patch deleted file mode 100644 index a44aef496..000000000 --- a/~emulatorman/iceweasel-libre/iceweasel-install-dir.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/baseconfig.mk ---- iceweasel-16.0.1.orig/config/baseconfig.mk 2012-10-10 19:42:45.000000000 -0200 -+++ iceweasel-16.0.1/config/baseconfig.mk 2012-10-12 05:40:32.346949927 -0200 -@@ -1,10 +1,10 @@ - INCLUDED_AUTOCONF_MK = 1 - - MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION))) --includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION) -+includedir := $(includedir)/$(MOZ_APP_NAME) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - DIST = $(DEPTH)/dist - - # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't -diff -Nur iceweasel-16.0.1.orig/js/src/config/baseconfig.mk iceweasel-16.0.1/js/src/config/baseconfig.mk ---- iceweasel-16.0.1.orig/js/src/config/baseconfig.mk 2012-10-10 19:43:05.000000000 -0200 -+++ iceweasel-16.0.1/js/src/config/baseconfig.mk 2012-10-12 05:08:23.064066227 -0200 -@@ -1,7 +1,7 @@ - INCLUDED_AUTOCONF_MK = 1 - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - - ifneq (,$(filter /%,$(TOP_DIST))) - DIST = $(TOP_DIST) |