gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-22 05:25:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix LANG setting in Makefile.doc. Remove extra indentation in messages.

Browse Source
This commit is contained in:
Kris Maglione
2009-01-21 14:53:12 -05:00
parent f36748338b
commit 91c5485c42
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/Makefile.common
View File

@@ -42,7 +42,7 @@ AWK = awk
TARGETS = all help info doc jar xpi install clean distclean $(JAR) TARGETS = all help info doc jar xpi install clean distclean $(JAR)
$(TARGETS:%=\%.%): $(TARGETS:%=\%.%):
echo " MAKE" $* $(@:$*.%=%) echo MAKE $* $(@:$*.%=%)
$(MAKE) -C $* $(@:$*.%=%) $(MAKE) -C $* $(@:$*.%=%)
.PHONY: $(TARGETS) .PHONY: $(TARGETS)
@@ -74,24 +74,24 @@ jar: $(JAR)
release: $(XPI) $(RDF) release: $(XPI) $(RDF)
$(RDF): $(RDF_IN) Makefile $(RDF): $(RDF_IN) Makefile
@echo " Preparing release..." @echo "Preparing release..."
$(SED) -e "s,###VERSION###,$(VERSION),g" \ $(SED) -e "s,###VERSION###,$(VERSION),g" \
-e "s,###DATE###,$(BUILD_DATE),g" \ -e "s,###DATE###,$(BUILD_DATE),g" \
< $< > $@ < $< > $@
@echo " SUCCESS: $@" @echo "SUCCESS: $@"
clean: $(LOCALES:%=%.clean) clean: $(LOCALES:%=%.clean)
@echo " General $(NAME) cleanup..." @echo "General $(NAME) cleanup..."
rm -f $(JAR) $(XPI) rm -f $(JAR) $(XPI)
distclean: $(LOCALES:%=%.distclean) clean distclean: $(LOCALES:%=%.distclean) clean
@echo " More $(NAME) cleanup..." @echo "More $(NAME) cleanup..."
rm -rf $(BUILD_DIR) rm -rf $(BUILD_DIR)
#### xpi #### xpi
$(XPI): $(JAR) $(XPI): $(JAR)
@echo " Building XPI..." @echo "Building XPI..."
mkdir -p $(XPI_PATH) mkdir -p $(XPI_PATH)
$(AWK) -v 'name=$(NAME)' -f $(BASE)/process_manifest.awk $(TOP)/chrome.manifest >$(XPI_PATH)/chrome.manifest $(AWK) -v 'name=$(NAME)' -f $(BASE)/process_manifest.awk $(TOP)/chrome.manifest >$(XPI_PATH)/chrome.manifest
$(MAKE_JAR) "$(XPI)" "$(XPI_BASES)" "$(XPI_DIRS)" "$(XPI_TEXTS)" "$(XPI_BINS)" "$(XPI_FILES)" $(MAKE_JAR) "$(XPI)" "$(XPI_BASES)" "$(XPI_DIRS)" "$(XPI_TEXTS)" "$(XPI_BINS)" "$(XPI_FILES)"
@@ -100,9 +100,9 @@ $(XPI): $(JAR)
#### jar #### jar
$(JAR): doc $(JAR): doc
@echo " Building JAR..." @echo "Building JAR..."
$(MAKE_JAR) "$(JAR)" "$(JAR_BASES)" "$(JAR_DIRS)" "$(JAR_TEXTS)" "$(JAR_BINS)" "$(JAR_FILES)" $(MAKE_JAR) "$(JAR)" "$(JAR_BASES)" "$(JAR_DIRS)" "$(JAR_TEXTS)" "$(JAR_BINS)" "$(JAR_FILES)"
@echo " SUCCESS: $@" @echo "SUCCESS: $@"
#### doc (see Makefile.doc) #### doc (see Makefile.doc)

2
common/Makefile.doc
View File

@@ -6,7 +6,7 @@ ASCIIDOC = asciidoc
AWK = awk AWK = awk
LOCALE = $(shell basename `pwd`) LOCALE = $(shell basename `pwd`)
LANG = $(shell basename `pwd` | $(AWK) -F- '{ print ($$1 ~ /^[a-z]\{2\}$$/) ? $$1 : "en" }') LANG = $(shell basename `pwd` | $(AWK) -F- '{ print ($$1 ~ /^[a-z][a-z]$$/) ? $$1 : "en" }')
ADC_SRC_FILES = $(wildcard *.txt) ADC_SRC_FILES = $(wildcard *.txt)
ADC_FILES = $(ADC_SRC_FILES:%.txt=%.html) ADC_FILES = $(ADC_SRC_FILES:%.txt=%.html)