andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug #5019 <https://bugs.freedesktop.org/show_bug.cgi?id=5019> xserver

Browse Source 
installs manpages into 'man1' instead of 'man1x'
This commit is contained in:
Alan Coopersmith 2005-11-13 20:53:24 +00:00
parent 3179d29b82
commit 267cbffa41
15 changed files with 195 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,6 +1,26 @@
2005-11-12 Alan Coopersmith <alan.coopersmith@sun.com>
* Xprint/doc/Makefile.am:
* hw/dmx/Makefile.am:
* hw/dmx/config/Makefile.am:
* hw/vfb/Makefile.am:
* hw/xfree86/doc/man/Makefile.am:
* hw/xfree86/getconfig/Makefile.am:
* hw/xfree86/utils/gtf/Makefile.am:
* hw/xfree86/utils/kbd_mode/Makefile.am:
* hw/xfree86/utils/pcitweak/Makefile.am:
* hw/xfree86/utils/scanpci/Makefile.am:
* hw/xfree86/utils/xorgcfg/Makefile.am:
* hw/xfree86/utils/xorgconfig/Makefile.am:
* hw/xnest/Makefile.am:
* hw/xwin/Makefile.am:
Bug #5019 <https://bugs.freedesktop.org/show_bug.cgi?id=5019>
xserver installs manpages into 'man1' instead of 'man1x'
2005-11-12 Alan Coopersmith <alan.coopersmith@sun.com>
* include/dix-config.h.in:
Bug #4832 <https://bugs.freedesktop.org/show_bug.cgi?id=4832>
use RGB_DB not RGB_PATH as that's what configure defines
(Jürg Billeter <j@bitron.ch>)

18
Xprint/doc/Makefile.am
View File

@ -1,11 +1,19 @@
MAN_SRCS = Xprt.man.pre
man1_MANS = Xprt.man
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
all-local: $(man1_MANS)
CLEANFILES = $(man1_MANS)
appman_SOURCES = Xprt.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
include $(top_srcdir)/cpprules.in
EXTRA_DIST = $(MAN_SRCS) Xprt.html Xprt.sgml
BUILT_SOURCES = $(appman_SOURCES)
CLEANFILES = $(appman_SOURCES) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
-rm -f $@
$(LN_S) $< $@
EXTRA_DIST = $(MAN_SRCS) Xprt.html Xprt.sgml

23
hw/dmx/Makefile.am
View File

@ -84,4 +84,25 @@ Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H \
$(GLX_INCS) \
@DMXMODULES_CFLAGS@
dist_man_MANS = Xdmx.1
# Man page
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
appman_SOURCES = Xdmx.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
CLEANFILES = $(appman_DATA)
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
EXTRA_DIST = $(appman_SOURCES)

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

@ -47,9 +47,26 @@ dmxtodmx_DEPENDENCIES = libdmxconfig.a
dmxtodmx_SOURCES = dmxtodmx.c
dmxtodmx_LDADD = -L. -ldmxconfig
dist_man1_MANS = xdmxconfig.man vdltodmx.man dmxtodmx.man
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
appman_SOURCES = xdmxconfig.man vdltodmx.man dmxtodmx.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
CLEANFILES = $(appman_DATA)
SUFFIXES = .$(APP_MAN_SUFFIX) .man
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
MAN_SUBSTS = -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|'
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
EXTRA_DIST = \
$(appman_SOURCES) \
test-a.in test-a.out \
test-b.in test-b.out \
test-c.in test-c.out \

14
hw/vfb/Makefile.am
View File

@ -27,8 +27,18 @@ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
# Man page
include $(top_srcdir)/cpprules.in
man1_MANS = Xvfb.man
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
CLEANFILES = $(man1_MANS)
appman_SOURCES = Xvfb.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
BUILT_SOURCES = $(appman_SOURCES)
CLEANFILES = $(appman_SOURCES) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
-rm -f $@
$(LN_S) $< $@
EXTRA_DIST = Xvfb.man.pre

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

@ -1,11 +1,16 @@
# Xserver.man covers options generic to all X servers built in this tree
MAN_SRCS = Xorg.man.pre xorg.conf.man.pre
man1_MANS = Xorg.man
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
appman_DATA = Xorg.$(APP_MAN_SUFFIX)
filemandir = $(mandir)/man$(FILE_MAN_SUFFIX)
fileman_DATA = xorg.conf.$(FILE_MAN_SUFFIX)
Xorg.$(APP_MAN_SUFFIX): Xorg.man
-rm -f Xorg.$(APP_MAN_SUFFIX)
$(LN_S) Xorg.man Xorg.$(APP_MAN_SUFFIX)
xorg.conf.$(FILE_MAN_SUFFIX): xorg.conf.man
-rm -f xorg.conf.$(FILE_MAN_SUFFIX)
$(LN_S) xorg.conf.man xorg.conf.$(FILE_MAN_SUFFIX)
@ -14,6 +19,6 @@ include $(top_srcdir)/cpprules.in
EXTRAMANDEFS = -D__logdir__=$(logdir)
CLEANFILES = $(man1_MANS) $(fileman_DATA) xorg.conf.man
CLEANFILES = $(appman_DATA) $(fileman_DATA) xorg.conf.man Xorg.man
EXTRA_DIST = $(MAN_SRCS)

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

@ -31,10 +31,12 @@ dist_bin_SCRIPTS = getconfig getconfig.pl
getconfigdir = $(libdir)/X11/getconfig
dist_getconfig_DATA = xorg.cfg cfg.sample
man1_MANS = getconfig.man
include $(top_srcdir)/cpprules.in
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
appman_SOURCES = getconfig.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
filemandir = $(mandir)/man$(FILE_MAN_SUFFIX)
fileman_DATA = getconfig.$(FILE_MAN_SUFFIX)
@ -42,6 +44,13 @@ getconfig.$(FILE_MAN_SUFFIX): cfg.man
-rm -f getconfig.$(FILE_MAN_SUFFIX)
$(LN_S) cfg.man getconfig.$(FILE_MAN_SUFFIX)
CLEANFILES = $(fileman_DATA) cfg.man getconfig.man
SUFFIXES += .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
-rm -f $@
$(LN_S) $< $@
BUILT_SOURCES = $(appman_SOURCES)
CLEANFILES = $(appman_SOURCES) $(appman_DATA) $(fileman_DATA) cfg.man
EXTRA_DIST = cfg.man.pre getconfig.man.pre

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

@ -32,11 +32,19 @@ gtf_SOURCES = gtf.c
gtf_CFLAGS = $(XORG_CFLAGS)
gtf_LDADD = -lm
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
man1_MANS = gtf.man
CLEANFILES = $(man1_MANS)
appman_SOURCES = gtf.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
include $(top_srcdir)/cpprules.in
EXTRA_DIST = gtf.man.pre
BUILT_SOURCES = $(appman_SOURCES)
CLEANFILES = $(appman_SOURCES) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
-rm -f $@
$(LN_S) $< $@

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

@ -43,9 +43,14 @@ kbd_mode_SOURCES = sun-kbd_mode.c
MAN_SRC = sun-kbd_mode.man.pre
endif
man1_MANS = kbd_mode.man
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
all-local: kbd_mode.man.pre $(man1_MANS)
appman_SOURCES = kbd_mode.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
BUILT_SOURCES = $(appman_SOURCES)
CLEANFILES = $(appman_SOURCES) $(appman_DATA)
all-local: kbd_mode.man.pre $(appman_DATA)
kbd_mode.man.pre: $(MAN_SRC)
$(LN_S) $(MAN_SRC) kbd_mode.man.pre
@ -54,4 +59,10 @@ endif
include $(top_srcdir)/cpprules.in
SUFFIXES += .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
-rm -f $@
$(LN_S) $< $@
EXTRA_DIST = bsd-kbd_mode.man.pre sun-kbd_mode.man.pre

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

@ -41,10 +41,19 @@ pcitweak_LDADD = \
pcitweak_SOURCES = \
pcitweak.c
man1_MANS = pcitweak.man
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
CLEANFILES = $(man1_MANS)
appman_SOURCES = pcitweak.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
include $(top_srcdir)/cpprules.in
EXTRA_DIST = pcitweak.man.pre
BUILT_SOURCES = $(appman_SOURCES)
CLEANFILES = $(appman_SOURCES) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
-rm -f $@
$(LN_S) $< $@

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

@ -43,10 +43,19 @@ scanpci_LDADD = \
scanpci_SOURCES = \
scanpci.c
man1_MANS = scanpci.man
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
CLEANFILES = $(man1_MANS)
appman_SOURCES = scanpci.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
include $(top_srcdir)/cpprules.in
EXTRA_DIST = scanpci.man.pre
EXTRA_DIST = scanpci.man.pre
BUILT_SOURCES = $(appman_SOURCES)
CLEANFILES = $(appman_SOURCES) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
-rm -f $@
$(LN_S) $< $@

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

@ -129,12 +129,21 @@ XOrgCfg: XOrgCfg.pre
$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < XOrgCfg.pre | $(CPP_SED_MAGIC) > $@
# Man page
man1_MANS = xorgcfg.man
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
all-local: $(man1_MANS)
appman_SOURCES = xorgcfg.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
all-local: $(appman_SOURCES) $(appman_DATA)
EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre xorgcfg.man.pre
BUILT_SOURCES = $(appman_SOURCES)
CLEANFILES = $(APPDEFAULTFILES) $(BUILT_SOURCES) $(appman_DATA)
CLEANFILES = $(APPDEFAULTFILES) $(man1_MANS)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
-rm -f $@
$(LN_S) $< $@
endif

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

@ -47,13 +47,23 @@ xorgconfig_SOURCES = \
# Man page
include $(top_srcdir)/cpprules.in
man1_MANS = xorgconfig.man
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
appman_SOURCES = xorgconfig.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
EXTRAMANDEFS = \
-D__XCONFIGFILE__=$(__XCONFIGFILE__) \
-D__XSERVERNAME__=$(XSERVERNAME)
CLEANFILES = $(man1_MANS)
BUILT_SOURCES = $(appman_SOURCES)
CLEANFILES = $(appman_SOURCES) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
-rm -f $@
$(LN_S) $< $@
EXTRA_DIST = \
Cards98 \

23
hw/xnest/Makefile.am
View File

@ -66,8 +66,23 @@ EXTRA_DIST = os2Stub.c \
# EXT_DEFINES???
# ICONFIGFILES -- SpecialCObjectRule
man1_MANS = Xnest.man
CLEANFILES = $(man1_MANS)
# Man page
include $(top_srcdir)/cpprules.in
appmandir = $(mandir)/man$(APP_MAN_SUFFIX)
appman_SOURCES = Xnest.man
appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
EXTRAMANDEFS = \
-D__XCONFIGFILE__=$(__XCONFIGFILE__) \
-D__XSERVERNAME__=$(XSERVERNAME)
BUILT_SOURCES = $(appman_SOURCES)
CLEANFILES = $(appman_SOURCES) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
-rm -f $@
$(LN_S) $< $@

2
hw/xwin/Makefile.am
View File

@ -164,7 +164,7 @@ AM_LFLAGS = -i
AM_CFLAGS = -DHAVE_XWIN_CONFIG_H \
$(XWINMODULES_CFLAGS)
dist_man_MANS = XWin.1 XWinrc.1
dist_man1_MANS = XWin.man XWinrc.man
EXTRA_DIST = \
_usr_X11R6_lib_X11_system.XWinrc \