summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2013-05-08 13:42:14 (EDT)
committer P. J. McDermott <pjm@nac.net>2013-05-08 13:42:14 (EDT)
commitbf813b61f45499db4dce4848ab6f67e4b013fbcd (patch)
treeba208b54395d9db30ab612f0c94cb7d295fd8153
parent1e64742211ab37a98f57d5fdd25e26542a7ef2a7 (diff)
Move code from locale/local.mk to Makefile.in.
-rw-r--r--Makefile.in15
-rw-r--r--locale/local.mk9
2 files changed, 10 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in
index ac35fc3..4ef1a45 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,8 +41,6 @@ archtab = @archtab@
pkglibbuildsystemdir = $(pkglibdir)/buildsystem
-.SUFFIXES:
-
include $(srcdir)/src/local.mk
include $(srcdir)/lib/local.mk
include $(srcdir)/lib/buildsystem/local.mk
@@ -53,7 +51,7 @@ bin = $(bin_srcs:.sh=)
pkglib = $(pkglib_srcs:.sh=.sm)
pkglibbuildsystem = $(pkglibbuildsystem_srcs:.sh=.sm)
man1 = $(man1_srcs:.1in=.1)
-locale = $(locale_locale)
+locale = $(locale_srcs:.sh=.ms)
distdir = $(package_name)-$(package_version)
distfiles = \
@@ -68,11 +66,12 @@ distfiles = \
src/local.mk \
lib/local.mk \
man/local.mk \
+ locale/local.mk \
$(bin_srcs) \
$(pkglib_srcs) \
$(pkglibbuildsystem_srcs) \
$(man1_srcs) \
- $(locale_distfiles)
+ $(locale_srcs)
# FIXME: libopkhelper is deprecated. Migrate code and remove this variable.
script = \
@@ -84,7 +83,8 @@ script = \
s&@@LOCALEDIR@@&$(localedir)&;\
s&@@SH@@&$(sh)&;
-.SUFFIXES: .sh .sm .1in .1
+.SUFFIXES:
+.SUFFIXES: .sh .sm .1in .1 .ms
.sh:
@printf ' SED %s\n' '$*'
@@ -109,6 +109,11 @@ script = \
sed "$(script) s&@@DATE@@&$${y}-$${m}-$${d}&;" \
'$(srcdir)/$*.1in' >'$*.1'
+.sh.ms:
+ @printf ' CP %s\n' '$*.ms'
+ @obj='$*'; mkdir -p "$${obj%/*}"
+ @cp '$(srcdir)/$*.sh' '$*.ms'
+
all: all-exec all-data
all-exec: all-bin all-pkglib all-pkglibbuildsystem
all-bin: $(bin)
diff --git a/locale/local.mk b/locale/local.mk
index 5941c5f..888b71b 100644
--- a/locale/local.mk
+++ b/locale/local.mk
@@ -18,12 +18,3 @@
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'