diff options
| -rw-r--r-- | Makefile.am | 26 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | man/Makefile.am | 20 | ||||
| -rw-r--r-- | man/startx.man (renamed from startx.man) | 0 | ||||
| -rw-r--r-- | man/xinit.man (renamed from xinit.man) | 0 |
5 files changed, 30 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am index 6c4ef24..c179fa9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,25 +29,8 @@ xinit_LDADD = $(XINIT_LIBS) xinit_SOURCES = \ xinit.c -appmandir = $(APP_MAN_DIR) -appman_PRE = startx.man xinit.man -appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -MAN_SUBSTS+= -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \ - -e 's|__XCONFIGFILE__|$(XCONFIGFILE)|g' \ - -e 's|__XCONFIGFILEMAN__|$(XCONFIGFILEMAN)|g' \ - -e 's|__xinitdir__|$(XINITDIR)|g' \ - -e 's|__bindir__|$(bindir)|g' \ - -e 's|__libdir__|$(libdir)|g' \ - -e 's|__SCOMAN__|$(SCOMAN)|g' - include $(top_srcdir)/cpprules.in -SUFFIXES += .$(APP_MAN_SUFFIX) .man -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - xinitrcdir = $(XINITDIR) PROGCPPDEFS = \ @@ -67,18 +50,19 @@ CPP_FILES_FLAGS = \ -D__bindir__="$(bindir)" \ -DBUNDLE_ID_PREFIX="$(bundleidprefix)" +SUBDIRS = man if LAUNCHD -SUBDIRS = launchd +SUBDIRS += launchd endif -DIST_SUBDIRS = launchd +DIST_SUBDIRS = launchd man xinitrc_DATA = xinitrc MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = xinitrc startx $(appman_DATA) $(launchagents_DATA) +CLEANFILES = xinitrc startx $(launchagents_DATA) -EXTRA_DIST = xinitrc.cpp startx.cpp $(appman_PRE) \ +EXTRA_DIST = xinitrc.cpp startx.cpp \ autogen.sh .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index dbd17de..9aa2f2e 100644 --- a/configure.ac +++ b/configure.ac @@ -204,8 +204,9 @@ AC_SUBST(XAUTH) AC_SUBST(XINIT) AC_SUBST(XINITDIR) -AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([launchd/Makefile]) -AC_CONFIG_FILES([launchd/privileged_startx/Makefile]) -AC_CONFIG_FILES([launchd/user_startx/Makefile]) +AC_CONFIG_FILES([Makefile + man/Makefile + launchd/Makefile + launchd/privileged_startx/Makefile + launchd/user_startx/Makefile]) AC_OUTPUT diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..074bc36 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,20 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = startx.man xinit.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +MAN_SUBSTS+= -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \ + -e 's|__XCONFIGFILE__|$(XCONFIGFILE)|g' \ + -e 's|__XCONFIGFILEMAN__|$(XCONFIGFILEMAN)|g' \ + -e 's|__xinitdir__|$(XINITDIR)|g' \ + -e 's|__bindir__|$(bindir)|g' \ + -e 's|__libdir__|$(libdir)|g' \ + -e 's|__SCOMAN__|$(SCOMAN)|g' + +# 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/startx.man b/man/startx.man index 0405be0..0405be0 100644 --- a/startx.man +++ b/man/startx.man diff --git a/xinit.man b/man/xinit.man index 31b93aa..31b93aa 100644 --- a/xinit.man +++ b/man/xinit.man |