Make locale/ non-recursive.

3 files changed, 61 insertions, 84 deletions

diff --git a/Makefile.in b/Makefile.in
index 38e01cb..6d61c76 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,6 +29,7 @@ libopkhelper = @libopkhelper@
 datadir = @datadir@
 mandir = @mandir@
 man1dir = @man1dir@
+localedir = @localedir@
 libopkbuild_1 = @libopkbuild_1@
 
 DESTDIR = /
@@ -53,10 +54,12 @@ MACROS = \
 include $(srcdir)/src/local.mk
 include $(srcdir)/lib/local.mk
 include $(srcdir)/man/local.mk
+include $(srcdir)/locale/local.mk
 
 bin = $(src_bin)
 pkglib = $(lib_pkglib)
 man1 = $(man_man1)
+locale = $(locale_locale)
 
 distdir = $(package_name)-$(package_version)
 distfiles = \
@@ -70,7 +73,8 @@ distfiles = \
 	TODO \
 	$(src_distfiles) \
 	$(lib_distfiles) \
-	$(man_distfiles)
+	$(man_distfiles) \
+	$(locale_distfiles)
 
 all: all-exec all-data
 	@printf 'Making locales...\n'
@@ -78,12 +82,11 @@ all: all-exec all-data
 all-exec: all-bin all-pkglib
 all-bin: $(bin)
 all-pkglib: $(pkglib)
-all-data: all-man1
+all-data: all-man1 all-locale
 all-man1: $(man1)
+all-locale: $(locale)
 
 clean: clean-exec clean-data
-	@printf 'Cleaning locales...\n'
-	@cd locale && $(MAKE) $(MACROS) clean
 clean-exec: clean-bin clean-pkglib
 clean-bin:
 	@for f in $(bin); do \
@@ -95,16 +98,19 @@ clean-pkglib:
 		printf '  RM %s\n' "$${f}"; \
 		rm -f "$${f}"; \
 	done
-clean-data: clean-man1
+clean-data: clean-man1 clean-locale
 clean-man1:
 	@for f in $(man1); do \
 		printf '  RM %s\n' "$${f}"; \
 		rm -f "$${f}"; \
 	done
+clean-locale:
+	@for f in $(locale); do \
+		printf '  RM %s\n' "$${f}"; \
+		rm -f "$${f}"; \
+	done
 
 install: all install-exec install-data
-	@printf 'Installing locales...\n'
-	@cd locale && $(MAKE) $(MACROS) install
 install-exec: install-bin install-pkglib
 install-bin:
 	@mkdir -p '$(DESTDIR)/$(bindir)'
@@ -126,7 +132,7 @@ install-pkglib:
 		cp "$${f}" "$(DESTDIR)/$(pkglibdir)/$${ff}"; \
 		chmod 644 "$(DESTDIR)/$(pkglibdir)/$${ff}"; \
 	done
-install-data: install-man1
+install-data: install-man1 install-locale
 install-man1:
 	@mkdir -p '$(DESTDIR)/$(man1dir)'
 	@for f in $(man1); do \
@@ -137,10 +143,18 @@ install-man1:
 		cp "$${f}" "$(DESTDIR)/$(man1dir)/$${ff}"; \
 		chmod 644 "$(DESTDIR)/$(man1dir)/$${ff}"; \
 	done
+install-locale:
+	@mkdir -p '$(DESTDIR)/$(localedir)'
+	@for f in $(locale); do \
+		printf '  INSTALL %s\n' "$${f}"; \
+		ff="$$(printf '%s' "$${f}" | sed 's|^[^/]*/||')"; \
+		[ "x$${ff%/?*}" != "x$${ff}" ] && \
+			mkdir -p "$(DESTDIR)/$(localedir)/$${ff%/?*}"; \
+		cp "$${f}" "$(DESTDIR)/$(localedir)/$${ff}"; \
+		chmod 644 "$(DESTDIR)/$(localedir)/$${ff}"; \
+	done
 
 uninstall: uninstall-exec uninstall-data
-	@printf 'Uninstalling locales...\n'
-	@cd locale && $(MAKE) $(MACROS) uninstall
 uninstall-exec: uninstall-bin uninstall-pkglib
 uninstall-bin:
 	@for f in $(bin); do \
@@ -154,13 +168,19 @@ uninstall-pkglib:
 		ff="$$(printf '%s' "$${f}" | sed 's|^[^/]*/||')"; \
 		rm -f "$(DESTDIR)/$(pkglibdir)/$${ff}"; \
 	done
-uninstall-data: uninstall-man1
+uninstall-data: uninstall-man1 uninstall-locale
 uninstall-man1:
-	@for f in $(man1); do \
+	@for f in $(locale); do \
 		printf '  RM %s\n' "$${f}"; \
 		ff="$$(printf '%s' "$${f}" | sed 's|^[^/]*/||')"; \
 		rm -f "$(DESTDIR)/$(man1dir)/$${ff}"; \
 	done
+uninstall-locale:
+	@for f in $(locale); do \
+		printf '  RM %s\n' "$${f}"; \
+		ff="$$(printf '%s' "$${f}" | sed 's|^[^/]*/||')"; \
+		rm -f "$(DESTDIR)/$(localedir)/$${ff}"; \
+	done
 
 $(distdir):
 	@mkdir -p '$(distdir)'
diff --git a/locale/Makefile.in b/locale/Makefile.in
deleted file mode 100644
index d7a3b4f..0000000
--- a/locale/Makefile.in
+++ /dev/null
@@ -1,72 +0,0 @@
-# opkhelper
-# Makefile.in
-# Input Makefile for configure.
-#
-# Copyright (C) 2012 Patrick "P. J." McDermott
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package_name = @package_name@
-package_version= @package_version@
-
-srcdir = @srcdir@
-prefix = @prefix@
-datadir = @datadir@
-localedir = @localedir@
-
-.SUFFIXES:
-.SUFFIXES: .sh .ms
-
-SRCS = en_US/opkhelper.sh
-OBJS = $(SRCS:.sh=.ms)
-
-distdir = ../$(package_name)-$(package_version)/locale
-distfiles = Makefile.in $(SRCS)
-
-all: $(OBJS)
-
-$(OBJS):
-	@printf '  CP locale/%s\n' '$@'
-	@obj='$@'; mkdir -p "$${obj%/*}"
-	@cp '$(srcdir)/locale/$*.sh' '$@'
-
-clean:
-	@for obj in $(OBJS); do \
-		printf '  RM locale/%s\n' "$${obj}"; \
-		rm -f "$${obj}"; \
-	done
-
-install: all
-	@for obj in $(OBJS); do \
-		printf '  INSTALL locale/%s\n' "$${obj}"; \
-		mkdir -p "$(DESTDIR)/$(localedir)/$${obj%/*}/LC_MESSAGES"; \
-		dest="$(DESTDIR)/$(localedir)/$${obj%/*}/LC_MESSAGES/$${obj##*/}"; \
-		cp "$${obj}" "$${dest}"; \
-		chmod 644 "$${dest}"; \
-	done
-
-uninstall:
-	@for obj in $(OBJS); do \
-		printf '  RM %s\n' "$${obj}"; \
-		dest="$(DESTDIR)/$(localedir)/$${obj%/*}/LC_MESSAGES/$${obj##*/}"; \
-		rm -f "$${dest}"; \
-	done
-
-$(distdir):
-	@mkdir -p '$(distdir)'
-	@for file in $(distfiles); do \
-		file="./$${file}"; \
-		mkdir -p "$(distdir)/$${file%/*}"; \
-		cp -p "$${file}" "$(distdir)/$${file%/*}"; \
-	done
diff --git a/locale/local.mk b/locale/local.mk
new file mode 100644
index 0000000..5941c5f
--- /dev/null
+++ b/locale/local.mk
@@ -0,0 +1,29 @@
+# opkhelper
+# locale/local.mk
+#
+# Copyright (C) 2012-2013 Patrick "P. J." McDermott
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+locale_srcs = \
+	locale/en_US/opkhelper.sh
+locale_locale = $(locale_srcs:.sh=.ms)
+locale_distfiles = locale/local.mk $(locale_srcs)
+
+.SUFFIXES: .sh .ms
+
+.sh.ms:
+	@printf '  CP %s\n' '$*.ms'
+	@obj='$*'; mkdir -p "$${obj%/*}"
+	@cp '$(srcdir)/$*.sh' '$*.ms'