diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:06:56 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:06:56 -0500 |
| commit | 1439da945a066c5bdf821a4f1af2bc356452e170 (patch) | |
| tree | 099cf54d224b6799c45f4139ac8e4877a77ab0cb | |
| parent | 2bb00a3e1d7eea20a232f079d41cd45985e0a721 (diff) | |
config: move man pages into their own directory
Use services provided by XORG_MANPAGE_SECTIONS.
Use standard Makefile for man pages.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | Makefile.am | 21 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xlsclients.man (renamed from xlsclients.man) | 0 |
4 files changed, 18 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index 4bd94c8..0fb5667 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 = xlsclients AM_CFLAGS = $(CWARNFLAGS) $(XLSCLIENTS_CFLAGS) @@ -27,24 +28,8 @@ xlsclients_LDADD = $(XLSCLIENTS_LIBS) $(LIBOBJS) xlsclients_SOURCES = \ xlsclients.c -appman_PRE = \ - xlsclients.man - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = strnlen.h 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 @@ -55,5 +40,3 @@ ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL - -EXTRA_DIST += strnlen.h diff --git a/configure.ac b/configure.ac index 3d7410f..39204e8 100644 --- a/configure.ac +++ b/configure.ac @@ -47,4 +47,7 @@ XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XLSCLIENTS, xcb xcb-atom) -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..0837dba --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xlsclients.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/xlsclients.man b/man/xlsclients.man index 552907f..552907f 100644 --- a/xlsclients.man +++ b/man/xlsclients.man |