From bf813b61f45499db4dce4848ab6f67e4b013fbcd Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Wed, 08 May 2013 13:42:14 -0400 Subject: Move code from locale/local.mk to Makefile.in. --- 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' -- cgit v0.9.1