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 /toolkit/mozapps/installer/packager.mk | |
| 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 'toolkit/mozapps/installer/packager.mk')
| -rw-r--r-- | toolkit/mozapps/installer/packager.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 68247e7df..71a956aa4 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -54,7 +54,7 @@ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_MANIFEST_DEPS) $(addprefix --unify ,$(UNIFY_DIST)) \ $(MOZ_PKG_MANIFEST) $(DIST) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \ $(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES))) - $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DEFINES) $(ACDEFINES) $(MOZ_PKG_DUPEFLAGS) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR) + $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR) ifdef MOZ_PACKAGE_JSSHELL # Package JavaScript Shell @echo 'Packaging JavaScript Shell...' |