summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Pavlic <ted@tedpavlic.com>2009-01-21 10:17:37 -0500
committerTed Pavlic <ted@tedpavlic.com>2009-01-21 10:17:37 -0500
commit9ad451b7f7c971be7633e9d537e049802bf6adf6 (patch)
treeaba8564375fa3e1c5a205c26e8690d34fe627167
parenteb88d7ea0b794fafc78d58ff2f121121cb6e542a (diff)
downloadpentadactyl-9ad451b7f7c971be7633e9d537e049802bf6adf6.tar.gz
Three small Makefile.doc fixes.
* Require language part of locale to be two lowercase letters. * Update Makefile.doc comment -- add "include" comment. * Get rid of muttator/locale/en-US/Makefile symlink in favor of include.
-rw-r--r--common/Makefile.doc4
-rw-r--r--[l---------]muttator/locale/en-US/Makefile3
2 files changed, 4 insertions, 3 deletions
diff --git a/common/Makefile.doc b/common/Makefile.doc
index 48c81e4e..b23e92fd 100644
--- a/common/Makefile.doc
+++ b/common/Makefile.doc
@@ -1,9 +1,9 @@
-# Symlink me to locale/*/Makefile
+# Symlink or me to (or include me from) locale/*/Makefile
#### configuration
LOCALE = $(shell basename `pwd`)
-LANG = $(shell basename `pwd` | awk -F- '{ print ($$1 ~ /^..$$/) ? $$1 : "en" }')
+LANG = $(shell basename `pwd` | awk -F- '{ print ($$1 ~ /^[a-z]\{2\}$$/) ? $$1 : "en" }')
ADC_SRC_FILES = $(wildcard *.txt)
ADC_FILES = $(ADC_SRC_FILES:%.txt=%.html)
diff --git a/muttator/locale/en-US/Makefile b/muttator/locale/en-US/Makefile
index 85510a12..627ca99b 120000..100644
--- a/muttator/locale/en-US/Makefile
+++ b/muttator/locale/en-US/Makefile
@@ -1 +1,2 @@
-../../../common/Makefile.doc \ No newline at end of file
+BASE = ../../../common
+include $(BASE)/Makefile.doc