diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2018-12-27 16:16:40 (EST) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2018-12-27 16:16:40 (EST) |
| commit | 9128234a6c5ba200f6fd8d6a80f094505748b6ab (patch) | |
| tree | 9a6b1eefd431f490ed1b08ea35561e07578110c6 | |
| parent | 9994f5da405c3d49560f7b20d7c64a95d8da2f86 (diff) | |
Move code from Makefile.am to man/local.mk
| -rw-r--r-- | Makefile.am | 17 | ||||
| -rw-r--r-- | man/local.mk | 21 |
2 files changed, 20 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 47a1ca2..cdc322d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,9 +33,7 @@ endif # * Our release target PACKAGE_STRING = $(PACKAGE_NAME) $(PACKAGE_VERSION_GIT) -MANUAL = Distribution Build System - -SUFFIXES = .sh .sho .1in .1 .ms +SUFFIXES = .sh .sho .ms SHOBJEXT = sho SHPPFLAGS = \ @@ -61,12 +59,6 @@ libopkbuild_ldadd = $(libopkbuild_sources:.sh=.sho) libopkbuild_dependencies = $(libopkbuild_ldadd) libopkbuild_shsoversion = 2 -man1_MANS = $(man1_sources:.1in=.1) -do_subst = sed \ - -e 's|@[@]PACKAGE_NAME[@]@|$(PACKAGE_NAME)|g' \ - -e "s|@[@]PACKAGE_VERSION[@]@|$(PACKAGE_VERSION_GIT)|g" \ - -e 's|@[@]PACKAGE_DESCRIPTION[@]@|$(MANUAL)|g' - locale_MESSAGES = $(locale_sources:.sh=.ms) dist_pkgdata_DATA = optstring @@ -74,8 +66,6 @@ dist_pkgdata_DATA = optstring CLEANFILES = \ $(libdata_DATA) \ $(libopkbuild_ldadd) \ - $(man1_MANS) \ - $(man3_MANS) \ $(locale_MESSAGES) libdatadir = $(datadir)/sh @@ -88,7 +78,6 @@ EXTRA_DIST = \ mksysconf.in \ $(libopkbuild_sources) \ $(EXTRA_libopkbuild_sources) \ - $(man1_sources) \ $(locale_sources) \ $(TESTS) \ tools/shpp.sh \ @@ -218,10 +207,6 @@ lib/libopkbuild.$(SHSOEXT).$(libopkbuild_shsoversion): \ $(AM_V_at)$(SH) -n $< $(AM_V_at)'$(srcdir)/tools/shpp.sh' $(SHPPFLAGS) $< $@ -.1in.1: - $(AM_V_GEN)$(MKDIR_P) "$$(dirname $@)" - $(AM_V_at)$(do_subst) $< >$@ - .sh.ms: $(AM_V_GEN)$(MKDIR_P) "$$(dirname $@)" $(AM_V_at)cp $< $@ diff --git a/man/local.mk b/man/local.mk index 5625b2e..8151f76 100644 --- a/man/local.mk +++ b/man/local.mk @@ -1,3 +1,5 @@ +MANUAL = Distribution Build System + #man1_sources = \ # opkbuild.1in \ # ob-checkbuilddeps.1in \ @@ -9,12 +11,27 @@ # ob-gencontrol.1in \ # ob-buildopk.1in \ # ob-genchanges.1in - +man1_MANS = $(man1_sources:.1in=.1) man3_MANS = \ %reldir%/ob_parse_changelog.3 \ %reldir%/ob_parse_dep.3 -CLEANFILES += %reldir%/Tags +SUFFIXES += .1in .1 +CLEANFILES += \ + %reldir%/Tags \ + $(man1_MANS) \ + $(man3_MANS) +EXTRA_DIST += \ + $(man1_sources) + +do_subst = sed \ + -e 's|@[@]PACKAGE_NAME[@]@|$(PACKAGE_NAME)|g' \ + -e "s|@[@]PACKAGE_VERSION[@]@|$(PACKAGE_VERSION_GIT)|g" \ + -e 's|@[@]PACKAGE_DESCRIPTION[@]@|$(MANUAL)|g' + +.1in.1: + $(AM_V_GEN)$(MKDIR_P) "$$(dirname $@)" + $(AM_V_at)$(do_subst) $< >$@ $(man3_MANS): %reldir%/Tags |