diff options
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xdriinfo.man (renamed from xdriinfo.man) | 0 |
4 files changed, 17 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 425098a..7b70eb4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xdriinfo AM_CFLAGS = $(CWARNFLAGS) $(XDRIINFO_CFLAGS) @@ -27,16 +28,7 @@ xdriinfo_LDADD = $(XDRIINFO_LIBS) xdriinfo_SOURCES = \ xdriinfo.c -appman_PRE = \ - xdriinfo.man - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) autogen.sh MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) .PHONY: ChangeLog INSTALL @@ -48,8 +40,4 @@ ChangeLog: dist-hook: ChangeLog INSTALL -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/configure.ac b/configure.ac index 02ed833..48c2c00 100644 --- a/configure.ac +++ b/configure.ac @@ -45,4 +45,7 @@ AC_SEARCH_LIBS([glXGetProcAddressARB], [GL], [], AC_MSG_FAILURE([cannot find GL library - make sure Mesa or other OpenGL package is installed]), [$XDRIINFO_LIBS]) -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..07d2f1f --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xdriinfo.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/xdriinfo.man b/man/xdriinfo.man index 75b9fc0..75b9fc0 100644 --- a/xdriinfo.man +++ b/man/xdriinfo.man |