diff options
| author | JustOff <Off.Just.Off@gmail.com> | 2018-04-14 19:18:40 +0300 |
|---|---|---|
| committer | JustOff <Off.Just.Off@gmail.com> | 2018-04-14 19:18:40 +0300 |
| commit | 01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125 (patch) | |
| tree | 69438df6a5406510ead01d5406872a9ca0ee1122 /config | |
| parent | 25370b7f0cc8709821acc8b7826c2c6e38268c67 (diff) | |
| parent | 64204fdb8302c8bf483d724430dd83f43c1cb6ff (diff) | |
| download | UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.gz UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.lz UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.xz UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP and resolve conflicts
Diffstat (limited to 'config')
| -rw-r--r-- | config/rules.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/rules.mk b/config/rules.mk index 122bd8a77..a6bd45d11 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -1129,6 +1129,12 @@ ifneq (,$(JAR_MANIFEST)) ifndef NO_DIST_INSTALL ifdef XPI_NAME +# XXX: Figure out why Pale Moon's defs.mk is not being propigated +ifndef XPI_ROOT_APPID +ifdef MC_PALEMOON +XPI_ROOT_APPID=$(MOZ_APP_ID) +endif +endif ifdef XPI_ROOT_APPID # For add-on packaging we may specify that an application # sub-dir should be added to the root chrome manifest with |