frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Alan Coopersmith 2005-11-28 22:05:09 +00:00
parent 381931b15b
commit 51a721a6db
15 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xprint/doc/Makefile.am
View File

@ -1,6 +1,6 @@
MAN_SRCS = Xprt.man.pre MAN_SRCS = Xprt.man.pre
appmandir = $(mandir)/man$(APP_MAN_SUFFIX) appmandir = $(APP_MAN_DIR)
appman_SOURCES = Xprt.man appman_SOURCES = Xprt.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@) appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)

2
doc/Makefile.am
View File

@ -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 # Xserver.man covers options generic to all X servers built in this tree
appman_SOURCES = Xserver.man.pre appman_SOURCES = Xserver.man.pre

2
hw/dmx/Makefile.am
View File

@ -85,7 +85,7 @@ Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H \
@DMXMODULES_CFLAGS@ @DMXMODULES_CFLAGS@
# Man page # Man page
appmandir = $(mandir)/man$(APP_MAN_SUFFIX) appmandir = $(APP_MAN_DIR)
appman_SOURCES = Xdmx.man appman_SOURCES = Xdmx.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@) appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)

2
hw/dmx/config/Makefile.am
View File

@ -47,7 +47,7 @@ dmxtodmx_DEPENDENCIES = libdmxconfig.a
dmxtodmx_SOURCES = dmxtodmx.c dmxtodmx_SOURCES = dmxtodmx.c
dmxtodmx_LDADD = -L. -ldmxconfig dmxtodmx_LDADD = -L. -ldmxconfig
appmandir = $(mandir)/man$(APP_MAN_SUFFIX) appmandir = $(APP_MAN_DIR)
appman_SOURCES = xdmxconfig.man vdltodmx.man dmxtodmx.man appman_SOURCES = xdmxconfig.man vdltodmx.man dmxtodmx.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@) appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)

2
hw/vfb/Makefile.am
View File

@ -27,7 +27,7 @@ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
# Man page # Man page
include $(top_srcdir)/cpprules.in include $(top_srcdir)/cpprules.in
appmandir = $(mandir)/man$(APP_MAN_SUFFIX) appmandir = $(APP_MAN_DIR)
appman_SOURCES = Xvfb.man appman_SOURCES = Xvfb.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@) appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)

4
hw/xfree86/doc/man/Makefile.am
View File

@ -1,10 +1,10 @@
# Xserver.man covers options generic to all X servers built in this tree # Xserver.man covers options generic to all X servers built in this tree
MAN_SRCS = Xorg.man.pre xorg.conf.man.pre 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) appman_DATA = Xorg.$(APP_MAN_SUFFIX)
filemandir = $(mandir)/man$(FILE_MAN_SUFFIX) filemandir = $(FILE_MAN_DIR)
fileman_DATA = xorg.conf.$(FILE_MAN_SUFFIX) fileman_DATA = xorg.conf.$(FILE_MAN_SUFFIX)
Xorg.$(APP_MAN_SUFFIX): Xorg.man Xorg.$(APP_MAN_SUFFIX): Xorg.man

2
hw/xfree86/fbdevhw/Makefile.am
View File

@ -16,7 +16,7 @@ sdk_HEADERS = fbdevhw.h
include $(top_srcdir)/cpprules.in include $(top_srcdir)/cpprules.in
drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX) drivermandir = $(DRIVER_MAN_DIR)
driverman_DATA = fbdevhw.$(DRIVER_MAN_SUFFIX) driverman_DATA = fbdevhw.$(DRIVER_MAN_SUFFIX)
CLEANFILES = $(driverman_DATA) fbdevhw.man CLEANFILES = $(driverman_DATA) fbdevhw.man

4
hw/xfree86/getconfig/Makefile.am
View File

@ -33,11 +33,11 @@ dist_getconfig_DATA = xorg.cfg cfg.sample
include $(top_srcdir)/cpprules.in include $(top_srcdir)/cpprules.in
appmandir = $(mandir)/man$(APP_MAN_SUFFIX) appmandir = $(APP_MAN_DIR)
appman_SOURCES = getconfig.man appman_SOURCES = getconfig.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@) appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
filemandir = $(mandir)/man$(FILE_MAN_SUFFIX) filemandir = $(FILE_MAN_DIR)
fileman_DATA = getconfig.$(FILE_MAN_SUFFIX) fileman_DATA = getconfig.$(FILE_MAN_SUFFIX)
getconfig.$(FILE_MAN_SUFFIX): cfg.man getconfig.$(FILE_MAN_SUFFIX): cfg.man

2
hw/xfree86/utils/gtf/Makefile.am
View File

@ -32,7 +32,7 @@ gtf_SOURCES = gtf.c
gtf_CFLAGS = $(XORG_CFLAGS) gtf_CFLAGS = $(XORG_CFLAGS)
gtf_LDADD = -lm gtf_LDADD = -lm
appmandir = $(mandir)/man$(APP_MAN_SUFFIX) appmandir = $(APP_MAN_DIR)
appman_SOURCES = gtf.man appman_SOURCES = gtf.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@) appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)

2
hw/xfree86/utils/kbd_mode/Makefile.am
View File

@ -43,7 +43,7 @@ kbd_mode_SOURCES = sun-kbd_mode.c
MAN_SRC = sun-kbd_mode.man.pre MAN_SRC = sun-kbd_mode.man.pre
endif endif
appmandir = $(mandir)/man$(APP_MAN_SUFFIX) appmandir = $(APP_MAN_DIR)
appman_SOURCES = kbd_mode.man appman_SOURCES = kbd_mode.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@) appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)

2
hw/xfree86/utils/pcitweak/Makefile.am
View File

@ -41,7 +41,7 @@ pcitweak_LDADD = \
pcitweak_SOURCES = \ pcitweak_SOURCES = \
pcitweak.c pcitweak.c
appmandir = $(mandir)/man$(APP_MAN_SUFFIX) appmandir = $(APP_MAN_DIR)
appman_SOURCES = pcitweak.man appman_SOURCES = pcitweak.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@) appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)

2
hw/xfree86/utils/scanpci/Makefile.am
View File

@ -43,7 +43,7 @@ scanpci_LDADD = \
scanpci_SOURCES = \ scanpci_SOURCES = \
scanpci.c scanpci.c
appmandir = $(mandir)/man$(APP_MAN_SUFFIX) appmandir = $(APP_MAN_DIR)
appman_SOURCES = scanpci.man appman_SOURCES = scanpci.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@) appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)

2
hw/xfree86/utils/xorgcfg/Makefile.am
View File

@ -129,7 +129,7 @@ XOrgCfg: XOrgCfg.pre
$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < XOrgCfg.pre | $(CPP_SED_MAGIC) > $@ $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < XOrgCfg.pre | $(CPP_SED_MAGIC) > $@
# Man page # Man page
appmandir = $(mandir)/man$(APP_MAN_SUFFIX) appmandir = $(APP_MAN_DIR)
appman_SOURCES = xorgcfg.man appman_SOURCES = xorgcfg.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@) appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)

2
hw/xfree86/utils/xorgconfig/Makefile.am
View File

@ -47,7 +47,7 @@ xorgconfig_SOURCES = \
# Man page # Man page
include $(top_srcdir)/cpprules.in include $(top_srcdir)/cpprules.in
appmandir = $(mandir)/man$(APP_MAN_SUFFIX) appmandir = $(APP_MAN_DIR)
appman_SOURCES = xorgconfig.man appman_SOURCES = xorgconfig.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@) appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)

2
hw/xnest/Makefile.am
View File

@ -69,7 +69,7 @@ EXTRA_DIST = os2Stub.c \
# Man page # Man page
include $(top_srcdir)/cpprules.in include $(top_srcdir)/cpprules.in
appmandir = $(mandir)/man$(APP_MAN_SUFFIX) appmandir = $(APP_MAN_DIR)
appman_SOURCES = Xnest.man appman_SOURCES = Xnest.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@) appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)