diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:06:55 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-01-19 10:06:55 -0500 |
| commit | 17fae9c20496a6f3e59abcc30e59d604aa809fed (patch) | |
| tree | 815be42a679797fe404c6c58e8c20504e9ee56ec | |
| parent | 5523785a9d17d06a0b3ad9b7c11249625ae5ce2d (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 | 17 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/viewres.man (renamed from viewres.man) | 0 |
4 files changed, 17 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 1691e3b..ad435da 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 = viewres AM_CFLAGS = $(VIEWRES_CFLAGS) $(CWARNFLAGS) @@ -27,9 +28,6 @@ viewres_LDADD = $(VIEWRES_LIBS) viewres_SOURCES = \ viewres.c -appman_PRE = \ - viewres.man - # App default files DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults @@ -39,20 +37,7 @@ dist_appdefault_DATA = \ app-defaults/Viewres \ app-defaults/Viewres-color -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 diff --git a/configure.ac b/configure.ac index bd18a72..dd3a9fd 100644 --- a/configure.ac +++ b/configure.ac @@ -45,4 +45,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..26e63ba --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = viewres.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/viewres.man b/man/viewres.man index a8f0650..a8f0650 100644 --- a/viewres.man +++ b/man/viewres.man |