diff options
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xgamma.man (renamed from xgamma.man) | 0 |
4 files changed, 17 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 4ca199d..d0a11d5 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 = xgamma AM_CFLAGS = $(CWARNFLAGS) $(XGAMMA_CFLAGS) @@ -27,18 +28,7 @@ xgamma_LDADD = $(XGAMMA_LIBS) xgamma_SOURCES = \ xgamma.c -appman_PRE = \ - xgamma.man - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - .PHONY: ChangeLog INSTALL @@ -51,8 +41,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 283e6d1..a9d6491 100644 --- a/configure.ac +++ b/configure.ac @@ -41,4 +41,7 @@ XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XGAMMA, x11 xxf86vm) -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..ea71d64 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xgamma.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/xgamma.man b/man/xgamma.man index 0216e40..0216e40 100644 --- a/xgamma.man +++ b/man/xgamma.man |