зеркало из https://github.com/mozilla/pjs.git
Changed make-resources to accept resources-translations on the commandline.
This fixes the long standing unclickable links problem under autoconf. Thanks to Ramiro Estrugo <ramiro@netscape.com> for the pointers that led to this fix.
This commit is contained in:
Родитель
c5c3546d6c
Коммит
a387d1cce9
|
@ -1156,7 +1156,7 @@ e_kit_resources.h: e_kit.ad
|
|||
@echo ';' >> $@
|
||||
|
||||
$(OBJDIR)/Netscape-nis-export.ad $(OBJDIR)/Netscape-export.ad: Makefile resources resources-translations versionn.h strs make-resources $(LOCALE_MAP)
|
||||
@./make-resources $@ Netscape Netscape versionn.h strs resources $(MOZ_USER_DIR) "" export $(LOCALES)
|
||||
@./make-resources $@ Netscape Netscape versionn.h strs resources resources-translations $(MOZ_USER_DIR) "" export $(LOCALES)
|
||||
|
||||
#######################################################################
|
||||
# The "-export" targets
|
||||
|
|
|
@ -1199,7 +1199,7 @@ e_kit_resources.h: e_kit.ad
|
|||
@echo ';' >> $@
|
||||
|
||||
$(OBJDIR)/Netscape-nis-export.ad $(OBJDIR)/Netscape-export.ad: Makefile resources resources-translations versionn.h strs make-resources $(LOCALE_MAP)
|
||||
@$(srcdir)/make-resources $@ Netscape Netscape $(srcdir)/versionn.h $(srcdir)/strs $(srcdir)/resources $(MOZ_USER_DIR) "" export $(LOCALES)
|
||||
@$(srcdir)/make-resources $@ Netscape Netscape $(srcdir)/versionn.h $(srcdir)/strs $(srcdir)/resources $(srcdir)/resources-translations $(MOZ_USER_DIR) "" export $(LOCALES)
|
||||
|
||||
#######################################################################
|
||||
# The "-export" targets
|
||||
|
|
|
@ -22,6 +22,7 @@ CLASS=$1; shift
|
|||
VERSIONN=$1; shift
|
||||
STRS=$1; shift
|
||||
RESOURCES=$1; shift
|
||||
RES_TRANS=$1; shift
|
||||
MOZ_USER_DIR=$1; shift
|
||||
VSUFFIX=$1; shift
|
||||
SS=$1; shift
|
||||
|
@ -90,7 +91,7 @@ cat ${RESOURCES} ${LOCALE_MAP} ${STRS} | sed \
|
|||
s/@URLVERSION@/${VERS}/g;
|
||||
s/@MOZ_USER_DIR@/${MOZ_USER_DIR}/g;
|
||||
/@INCLUDE resources-translations@.*/ {
|
||||
r resources-translations
|
||||
r ${RES_TRANS}
|
||||
d
|
||||
}" > ${DEST}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче