diff options
| -rw-r--r-- | Makefile.am | 20 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xload.man (renamed from xload.man) | 0 |
4 files changed, 18 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index f7f4ee0..dc94d84 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 = xload AM_CFLAGS = $(CWARNFLAGS) $(XLOAD_CFLAGS) @@ -32,9 +33,6 @@ xload_SOURCES = \ xload.c \ xload.h -appman_PRE = \ - xload.man - # App default files DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults @@ -44,21 +42,7 @@ dist_appdefault_DATA = \ app-defaults/XLoad EXTRA_DIST = xload.bit - -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 @@ -76,5 +60,5 @@ noinst_DATA = xload.po xload.po: $(xload_SOURCES:%=$(srcdir)/%) $(AM_V_GEN)xgettext -d xload -n $(xload_SOURCES:%=$(srcdir)/%) -CLEANFILES += xload.po +CLEANFILES = xload.po endif diff --git a/configure.ac b/configure.ac index a39845a..3c0a1d1 100644 --- a/configure.ac +++ b/configure.ac @@ -77,4 +77,7 @@ AC_ARG_WITH(appdefaultdir, AC_SUBST(appdefaultdir) -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..cf64267 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xload.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/xload.man b/man/xload.man index d938af3..d938af3 100644 --- a/xload.man +++ b/man/xload.man |