From 41014e4fe7b5b5e88e4f1013b6cf1477083ae507 Mon Sep 17 00:00:00 2001 From: Daniel Bainton Date: Thu, 4 Dec 2008 08:03:50 +0200 Subject: [PATCH] Edit the makefiles and chrome.manifests to work with common/ --- common/Makefile.common | 2 +- muttator/Makefile | 2 +- muttator/chrome.manifest | 8 ++++---- vimperator/Makefile | 2 +- vimperator/chrome.manifest | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/common/Makefile.common b/common/Makefile.common index 168d8647..eaa08f55 100644 --- a/common/Makefile.common +++ b/common/Makefile.common @@ -3,7 +3,7 @@ TOP = $(shell pwd) OS = $(shell uname -s) BUILD_DATE = $(shell date "+%Y/%m/%d %H:%M:%S") -BASE = $(TOP)/../liberator +BASE = $(TOP)/../common DOC_SRC_FILES = $(wildcard locale/*/*.txt) DOC_FILES = ${DOC_SRC_FILES:%.txt=%.html} diff --git a/muttator/Makefile b/muttator/Makefile index 49d5dd5c..13f19fdc 100644 --- a/muttator/Makefile +++ b/muttator/Makefile @@ -3,4 +3,4 @@ VERSION = 0.5pre NAME = muttator -include ../liberator/Makefile.common +include ../common/Makefile.common diff --git a/muttator/chrome.manifest b/muttator/chrome.manifest index 93497850..d4aaf20d 100644 --- a/muttator/chrome.manifest +++ b/muttator/chrome.manifest @@ -1,10 +1,10 @@ # Thunderbird -content muttator content/ +content muttator content/ locale liberator en-US locale/en-US/ -content liberator ../liberator/content/ -resource liberator ../liberator/modules/ -skin liberator classic/1.0 ../liberator/skin/ +content liberator ../common/content/ +resource liberator ../common/modules/ +skin liberator classic/1.0 ../common/skin/ override chrome://liberator/content/liberator.dtd chrome://muttator/content/liberator.dtd override chrome://liberator/content/config.js chrome://muttator/content/config.js diff --git a/vimperator/Makefile b/vimperator/Makefile index c9631584..fac3417f 100644 --- a/vimperator/Makefile +++ b/vimperator/Makefile @@ -3,4 +3,4 @@ VERSION = 2.0pre NAME = vimperator -include ../liberator/Makefile.common +include ../common/Makefile.common diff --git a/vimperator/chrome.manifest b/vimperator/chrome.manifest index c663f70b..495f62ef 100644 --- a/vimperator/chrome.manifest +++ b/vimperator/chrome.manifest @@ -1,10 +1,10 @@ # Firefox -content vimperator content/ -locale liberator en-US locale/en-US/ +content vimperator content/ +locale liberator en-US locale/en-US/ -content liberator ../liberator/content/ -resource liberator ../liberator/modules/ -skin liberator classic/1.0 ../liberator/skin/ +content liberator ../common/content/ +resource liberator ../common/modules/ +skin liberator classic/1.0 ../common/skin/ override chrome://liberator/content/liberator.dtd chrome://vimperator/content/liberator.dtd override chrome://liberator/content/config.js chrome://vimperator/content/config.js