diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-07 14:16:42 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-07 14:16:42 +0000 |
| commit | 4e3f3e7b8cc2c617187bdf23a9948bfd5121074e (patch) | |
| tree | ddd603e7fd5151ae250b7fb63c9e84eebc79814e /libX11/man | |
| parent | 6849d83857b4e470a44ad8b6aa5cfb283fd64c89 (diff) | |
| download | vcxsrv-4e3f3e7b8cc2c617187bdf23a9948bfd5121074e.tar.gz vcxsrv-4e3f3e7b8cc2c617187bdf23a9948bfd5121074e.tar.bz2 vcxsrv-4e3f3e7b8cc2c617187bdf23a9948bfd5121074e.zip | |
libXext xserver libX11 libXdmcp libxcb git update 7/8/2010
Diffstat (limited to 'libX11/man')
| -rw-r--r-- | libX11/man/Makefile.am | 24 | ||||
| -rw-r--r-- | libX11/man/xkb/Makefile.am | 21 |
2 files changed, 7 insertions, 38 deletions
diff --git a/libX11/man/Makefile.am b/libX11/man/Makefile.am index eebebdd75..b1bed16c3 100644 --- a/libX11/man/Makefile.am +++ b/libX11/man/Makefile.am @@ -1,6 +1,3 @@ -# Have to fake out automake by calling our man pages "DATA" since "MANS" won't
-# accept .3x as a valid man page suffix
-
SUBDIRS = xkb
libmandir = $(LIB_MAN_DIR)
@@ -198,8 +195,6 @@ filemandir = $(FILE_MAN_DIR) fileman_PRE = Compose.man
FILE_MAN_DIR_SUFFIX = $(FILE_MAN_DIR:@mandir@/man%=%)
-# What we actually install
-
if MANPAGES
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(all_shadows:=.@LIB_MAN_SUFFIX@)
@@ -212,24 +207,13 @@ EXTRA_DIST = $(libman_PRE) $(fileman_PRE) CLEANFILES = $(libman_DATA) $(fileman_DATA)
-include $(top_srcdir)/cpprules.in
-
-SUFFIXES += .$(LIB_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man
-
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \
- -D__appmansuffix__=$(APP_MAN_SUFFIX) \
- -D__filemansuffix__=$(FILE_MAN_SUFFIX) \
- -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
- -D__xlocaledir__="$(X11_LOCALEDATADIR)" \
- -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\""
+SUFFIXES = .$(LIB_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man
-CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)
+MAN_SUBSTS += -e 's|__xlocaledir__|$(X11_LOCALEDATADIR)|g'
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(LIB_MAN_SUFFIX) .man.$(FILE_MAN_SUFFIX):
- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
all_shadows = \
diff --git a/libX11/man/xkb/Makefile.am b/libX11/man/xkb/Makefile.am index f388248ec..e385d445e 100644 --- a/libX11/man/xkb/Makefile.am +++ b/libX11/man/xkb/Makefile.am @@ -1,6 +1,3 @@ -# Have to fake out automake by calling our man pages "DATA" since "MANS" won't
-# accept .3x as a valid man page suffix
-
libmandir = $(LIB_MAN_DIR)
LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
@@ -207,8 +204,6 @@ libman_PRE = \ XkbUpdateMapFromCore.man \
XkbVirtualModsToReal.man
-# What we actually install
-
if MANPAGES
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
endif
@@ -217,18 +212,8 @@ EXTRA_DIST = $(libman_PRE) CLEANFILES = $(libman_DATA)
-include $(top_srcdir)/cpprules.in
-
-SUFFIXES += .$(LIB_MAN_SUFFIX) .man
-
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \
- -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\""
-
-CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)
+SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(LIB_MAN_SUFFIX):
- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
-
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|