diff options
| -rw-r--r-- | Makefile.am | 36 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xvidtune.man (renamed from xvidtune.man) | 0 |
4 files changed, 17 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am index cc5c3a4..1ebd2a9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xvidtune AM_CFLAGS = $(CWARNFLAGS) $(XVIDTUNE_CFLAGS) @@ -28,36 +29,6 @@ xvidtune_LDADD = $(XVIDTUNE_LIBS) xvidtune_SOURCES = \ xvidtune.c -# Man page - -appmandir = $(APP_MAN_DIR) -appman_PRE = xvidtune.man -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - # App default files DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults @@ -65,12 +36,7 @@ appdefaultdir = @appdefaultdir@ dist_appdefault_DATA = app-defaults/Xvidtune -EXTRA_DIST = $(appman_PRE) - MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = Xvidtune $(appman_DATA) - - .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 21eb48f..fda73a8 100644 --- a/configure.ac +++ b/configure.ac @@ -44,4 +44,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..680a9e9 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xvidtune.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/xvidtune.man b/man/xvidtune.man index 30379b6..30379b6 100644 --- a/xvidtune.man +++ b/man/xvidtune.man |