From 9ad451b7f7c971be7633e9d537e049802bf6adf6 Mon Sep 17 00:00:00 2001
From: Ted Pavlic <ted@tedpavlic.com>
Date: Wed, 21 Jan 2009 10:17:37 -0500
Subject: 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.
---
 common/Makefile.doc            | 4 ++--
 muttator/locale/en-US/Makefile | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
 mode change 120000 => 100644 muttator/locale/en-US/Makefile

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
deleted file mode 120000
index 85510a12..00000000
--- a/muttator/locale/en-US/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/Makefile.doc
\ No newline at end of file
diff --git a/muttator/locale/en-US/Makefile b/muttator/locale/en-US/Makefile
new file mode 100644
index 00000000..627ca99b
--- /dev/null
+++ b/muttator/locale/en-US/Makefile
@@ -0,0 +1,2 @@
+BASE = ../../../common
+include $(BASE)/Makefile.doc
-- 
cgit v1.2.3