diff options
| -rw-r--r-- | Makefile.am | 43 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xlsfonts.man (renamed from xlsfonts.man) | 0 |
4 files changed, 21 insertions, 39 deletions
diff --git a/Makefile.am b/Makefile.am index bb83e7d..9cd8d5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,20 +19,19 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xlsfonts AM_CFLAGS = $(XLSFONTS_CFLAGS) $(CWARNFLAGS) xlsfonts_LDADD = $(XLSFONTS_LIBS) xlsfonts_SOURCES = \ - dsimple.c \ - dsimple.h \ + dsimple.c \ + dsimple.h \ xlsfonts.c -appman_PRE = \ - xlsfonts.man - -EXTRA_DIST = xlsfonts.xml autogen.sh +EXTRA_DIST = xlsfonts.xml +MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL @@ -43,35 +42,3 @@ ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST += $(appman_PRE) -MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - -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): - sed $(MAN_SUBSTS) < $< > $@ diff --git a/configure.ac b/configure.ac index afbc144..5c6b2e6 100644 --- a/configure.ac +++ b/configure.ac @@ -40,4 +40,7 @@ AC_CONFIG_HEADERS([config.h]) PKG_CHECK_MODULES(XLSFONTS, x11) -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..359ff92 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xlsfonts.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/xlsfonts.man b/man/xlsfonts.man index 620464e..620464e 100644 --- a/xlsfonts.man +++ b/man/xlsfonts.man |