diff options
| -rw-r--r-- | Makefile.am | 17 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xkbcomp.man (renamed from xkbcomp.man) | 0 |
4 files changed, 17 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index f612848..9a41b88 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xkbcomp AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' $(CWARNFLAGS) @@ -58,27 +59,11 @@ xkbcomp_SOURCES = \ xkbpath.h \ xkbscan.c -appman_PRE = \ - xkbcomp.man BUILT_SOURCES = xkbparse.c MAINTAINERCLEANFILES = ChangeLog INSTALL MAINTAINERCLEANFILES += $(BUILT_SOURCES) -appmandir = $(APP_MAN_DIR) - -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) < $< > $@ - - .PHONY: ChangeLog INSTALL INSTALL: diff --git a/configure.ac b/configure.ac index 5465cb2..f438c07 100644 --- a/configure.ac +++ b/configure.ac @@ -56,4 +56,7 @@ AC_ARG_WITH([xkb_config_root], AC_SUBST([XKBCONFIGROOT]) -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..f17336a --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xkbcomp.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/xkbcomp.man b/man/xkbcomp.man index 9b380a0..9b380a0 100644 --- a/xkbcomp.man +++ b/man/xkbcomp.man |