equal
deleted
inserted
replaced
82 #COPY_COMMON_FILES_2:= \ |
82 #COPY_COMMON_FILES_2:= \ |
83 # $(shell /usr/bin/rsync -ac patches/* ../firefox/patches/* $(PATCH_DIR)) |
83 # $(shell /usr/bin/rsync -ac patches/* ../firefox/patches/* $(PATCH_DIR)) |
84 #COPY_COMMON_FILES_3:= \ |
84 #COPY_COMMON_FILES_3:= \ |
85 # $(shell /usr/bin/rm -f $(PATCH_DIR)/firefox*42*.patch $(PATCH_DIR)/firefox*46*.patch) |
85 # $(shell /usr/bin/rm -f $(PATCH_DIR)/firefox*42*.patch $(PATCH_DIR)/firefox*46*.patch) |
86 |
86 |
87 include $(WS_MAKE_RULES)/common.mk |
|
88 |
|
89 # Depends on libsmbclient but samba is on the do-not-publish list, so this |
87 # Depends on libsmbclient but samba is on the do-not-publish list, so this |
90 # must be too. |
88 # must be too. |
91 ifeq ($(BUILD_TYPE), evaluation) |
89 ifeq ($(BUILD_TYPE), evaluation) |
92 BUILD_32= |
90 BUILD_32= |
93 INSTALL_32= |
91 INSTALL_32= |
94 PUBLISH_STAMP= |
92 PUBLISH_STAMP= |
95 endif |
93 endif |
|
94 |
|
95 include $(WS_MAKE_RULES)/common.mk |
96 |
96 |
97 # /usr/sbin needed for dtrace. |
97 # /usr/sbin needed for dtrace. |
98 PATH = $(dirname $(CC)):/usr/gnu/bin:/usr/bin:/usr/sbin |
98 PATH = $(dirname $(CC)):/usr/gnu/bin:/usr/bin:/usr/sbin |
99 |
99 |
100 MOZCONFIG = $(BUILD_DIR_32)/mozconfig |
100 MOZCONFIG = $(BUILD_DIR_32)/mozconfig |