| -rw-r--r-- | Makefile.am | 15 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/bdftopcf.man (renamed from bdftopcf.man) | 0 |
4 files changed, 17 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index e70293f..a4f2c74 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = bdftopcf AM_CFLAGS = $(CWARNFLAGS) @BDFTOPCF_CFLAGS@ @@ -26,21 +27,7 @@ bdftopcf_LDADD = @BDFTOPCF_LIBS@ bdftopcf_SOURCES = bdftopcf.c -appman_PRE = bdftopcf.man - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index ef40026..1fef743 100644 --- a/configure.ac +++ b/configure.ac @@ -40,4 +40,7 @@ PKG_CHECK_MODULES(BDFTOPCF, xfont) XORG_WITH_LINT -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..e90b491 --- a/dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = bdftopcf.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/bdftopcf.man b/man/bdftopcf.man index cd8f8cc..cd8f8cc 100644 --- a/bdftopcf.man +++ b/man/bdftopcf.man |