Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
This commit is contained in:
parent
381931b15b
commit
51a721a6db
|
@ -1,6 +1,6 @@
|
|||
MAN_SRCS = Xprt.man.pre
|
||||
|
||||
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_SOURCES = Xprt.man
|
||||
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
# Xserver.man covers options generic to all X servers built in this tree
|
||||
appman_SOURCES = Xserver.man.pre
|
||||
|
|
|
@ -85,7 +85,7 @@ Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H \
|
|||
@DMXMODULES_CFLAGS@
|
||||
|
||||
# Man page
|
||||
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_SOURCES = Xdmx.man
|
||||
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
|
||||
|
|
|
@ -47,7 +47,7 @@ dmxtodmx_DEPENDENCIES = libdmxconfig.a
|
|||
dmxtodmx_SOURCES = dmxtodmx.c
|
||||
dmxtodmx_LDADD = -L. -ldmxconfig
|
||||
|
||||
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_SOURCES = xdmxconfig.man vdltodmx.man dmxtodmx.man
|
||||
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
|
||||
|
|
|
@ -27,7 +27,7 @@ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
|
|||
# Man page
|
||||
include $(top_srcdir)/cpprules.in
|
||||
|
||||
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_SOURCES = Xvfb.man
|
||||
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
# Xserver.man covers options generic to all X servers built in this tree
|
||||
MAN_SRCS = Xorg.man.pre xorg.conf.man.pre
|
||||
|
||||
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
appman_DATA = Xorg.$(APP_MAN_SUFFIX)
|
||||
|
||||
filemandir = $(mandir)/man$(FILE_MAN_SUFFIX)
|
||||
filemandir = $(FILE_MAN_DIR)
|
||||
fileman_DATA = xorg.conf.$(FILE_MAN_SUFFIX)
|
||||
|
||||
Xorg.$(APP_MAN_SUFFIX): Xorg.man
|
||||
|
|
|
@ -16,7 +16,7 @@ sdk_HEADERS = fbdevhw.h
|
|||
|
||||
include $(top_srcdir)/cpprules.in
|
||||
|
||||
drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
|
||||
drivermandir = $(DRIVER_MAN_DIR)
|
||||
driverman_DATA = fbdevhw.$(DRIVER_MAN_SUFFIX)
|
||||
CLEANFILES = $(driverman_DATA) fbdevhw.man
|
||||
|
||||
|
|
|
@ -33,11 +33,11 @@ dist_getconfig_DATA = xorg.cfg cfg.sample
|
|||
|
||||
include $(top_srcdir)/cpprules.in
|
||||
|
||||
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
appman_SOURCES = getconfig.man
|
||||
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
|
||||
|
||||
filemandir = $(mandir)/man$(FILE_MAN_SUFFIX)
|
||||
filemandir = $(FILE_MAN_DIR)
|
||||
fileman_DATA = getconfig.$(FILE_MAN_SUFFIX)
|
||||
|
||||
getconfig.$(FILE_MAN_SUFFIX): cfg.man
|
||||
|
|
|
@ -32,7 +32,7 @@ gtf_SOURCES = gtf.c
|
|||
gtf_CFLAGS = $(XORG_CFLAGS)
|
||||
gtf_LDADD = -lm
|
||||
|
||||
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_SOURCES = gtf.man
|
||||
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
|
||||
|
|
|
@ -43,7 +43,7 @@ kbd_mode_SOURCES = sun-kbd_mode.c
|
|||
MAN_SRC = sun-kbd_mode.man.pre
|
||||
endif
|
||||
|
||||
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_SOURCES = kbd_mode.man
|
||||
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
|
||||
|
|
|
@ -41,7 +41,7 @@ pcitweak_LDADD = \
|
|||
pcitweak_SOURCES = \
|
||||
pcitweak.c
|
||||
|
||||
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_SOURCES = pcitweak.man
|
||||
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
|
||||
|
|
|
@ -43,7 +43,7 @@ scanpci_LDADD = \
|
|||
scanpci_SOURCES = \
|
||||
scanpci.c
|
||||
|
||||
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_SOURCES = scanpci.man
|
||||
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
|
||||
|
|
|
@ -129,7 +129,7 @@ XOrgCfg: XOrgCfg.pre
|
|||
$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < XOrgCfg.pre | $(CPP_SED_MAGIC) > $@
|
||||
|
||||
# Man page
|
||||
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_SOURCES = xorgcfg.man
|
||||
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
|
||||
|
|
|
@ -47,7 +47,7 @@ xorgconfig_SOURCES = \
|
|||
# Man page
|
||||
include $(top_srcdir)/cpprules.in
|
||||
|
||||
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_SOURCES = xorgconfig.man
|
||||
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
|
||||
|
|
|
@ -69,7 +69,7 @@ EXTRA_DIST = os2Stub.c \
|
|||
# Man page
|
||||
include $(top_srcdir)/cpprules.in
|
||||
|
||||
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_SOURCES = Xnest.man
|
||||
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
|
||||
|
|
Loading…
Reference in New Issue
Block a user