diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-05-08 12:32:23 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-05-08 12:34:47 (EDT) |
| commit | 3ab916d9df099c42caa51f14b79262732c9daaad (patch) | |
| tree | 37a69c900150ae874a6c7d1dc63b65b7ac09df73 | |
| parent | ac459d2b6da8ef97c9c3eface170bc21685ea01b (diff) | |
Move code from src/local.mk to Makefile.in.
| -rw-r--r-- | Makefile.in | 20 | ||||
| -rw-r--r-- | src/local.mk | 17 |
2 files changed, 18 insertions, 19 deletions
diff --git a/Makefile.in b/Makefile.in index f504c80..90eab0b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,7 +46,7 @@ include $(srcdir)/lib/local.mk include $(srcdir)/man/local.mk include $(srcdir)/locale/local.mk -bin = $(src_bin) +bin = $(bin_srcs:.sh=) pkglib = $(lib_pkglib) man1 = $(man_man1) locale = $(locale_locale) @@ -61,11 +61,27 @@ distfiles = \ INSTALL \ ChangeLog \ TODO \ - $(src_distfiles) \ + src/local.mk \ + $(bin_srcs) \ $(lib_distfiles) \ $(man_distfiles) \ $(locale_distfiles) +# FIXME: libopkhelper is deprecated. Migrate code and remove this variable. +script = \ + s&@@PACKAGE_NAME@@&$(package_name)&;\ + s&@@PACKAGE_VERSION@@&$(package_version)&;\ + s&@@PKGLIBDIR@@&$(pkglibdir)&;\ + s&@@LIBOPKHELPER@@&$(libopkhelper)&;\ + s&@@LOCALEDIR@@&$(localedir)&;\ + s&@@SH@@&$(sh)&; + +.SUFFIXES: .sh + +.sh: + @printf ' SED %s\n' '$*' + @sed '$(script)' '$(srcdir)/$*.sh' >'$*' + all: all-exec all-data all-exec: all-bin all-pkglib all-bin: $(bin) diff --git a/src/local.mk b/src/local.mk index c7a7b6c..da824aa 100644 --- a/src/local.mk +++ b/src/local.mk @@ -26,20 +26,3 @@ src_srcs = \ src/oh-autotest.sh \ src/oh-autoinstall.sh \ src/oh-architecture.sh -src_bin = $(src_srcs:.sh=) -src_distfiles = src/local.mk $(src_srcs) - -# FIXME: libopkhelper is deprecated. Migrate code and remove this variable. -src_script = \ - s&@@PACKAGE_NAME@@&$(package_name)&;\ - s&@@PACKAGE_VERSION@@&$(package_version)&;\ - s&@@PKGLIBDIR@@&$(pkglibdir)&;\ - s&@@LIBOPKHELPER@@&$(libopkhelper)&;\ - s&@@LOCALEDIR@@&$(localedir)&;\ - s&@@SH@@&$(sh)&; - -.SUFFIXES: .sh - -.sh: - @printf ' SED %s\n' '$*' - @sed '$(src_script)' '$(srcdir)/$*.sh' >'$*' |