diff options
| -rw-r--r-- | Xprint/doc/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/dmx/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/dmx/config/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/vfb/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/doc/man/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/xfree86/fbdevhw/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/getconfig/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/xfree86/utils/gtf/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/utils/kbd_mode/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/utils/pcitweak/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/utils/scanpci/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgconfig/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xnest/Makefile.am | 2 |
15 files changed, 17 insertions, 17 deletions
diff --git a/Xprint/doc/Makefile.am b/Xprint/doc/Makefile.am index 348d3aec6..e26d0ee98 100644 --- a/Xprint/doc/Makefile.am +++ b/Xprint/doc/Makefile.am @@ -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@) diff --git a/doc/Makefile.am b/doc/Makefile.am index 88a1b9dca..ff64992dc 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -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 diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am index 970d72c39..c9ac49363 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -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@) diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am index c6a80b4e0..8ddd06a66 100644 --- a/hw/dmx/config/Makefile.am +++ b/hw/dmx/config/Makefile.am @@ -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@) diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am index e837452f0..ccc46ee80 100644 --- a/hw/vfb/Makefile.am +++ b/hw/vfb/Makefile.am @@ -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@) diff --git a/hw/xfree86/doc/man/Makefile.am b/hw/xfree86/doc/man/Makefile.am index 0b7020eb8..d8b2aa73d 100644 --- a/hw/xfree86/doc/man/Makefile.am +++ b/hw/xfree86/doc/man/Makefile.am @@ -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 diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am index 11df42352..3ab56630b 100644 --- a/hw/xfree86/fbdevhw/Makefile.am +++ b/hw/xfree86/fbdevhw/Makefile.am @@ -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 diff --git a/hw/xfree86/getconfig/Makefile.am b/hw/xfree86/getconfig/Makefile.am index baa8ed69e..2c8e642b6 100644 --- a/hw/xfree86/getconfig/Makefile.am +++ b/hw/xfree86/getconfig/Makefile.am @@ -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 diff --git a/hw/xfree86/utils/gtf/Makefile.am b/hw/xfree86/utils/gtf/Makefile.am index df88c968f..f77dddd73 100644 --- a/hw/xfree86/utils/gtf/Makefile.am +++ b/hw/xfree86/utils/gtf/Makefile.am @@ -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@) diff --git a/hw/xfree86/utils/kbd_mode/Makefile.am b/hw/xfree86/utils/kbd_mode/Makefile.am index 9b7f0abd6..8469b6047 100644 --- a/hw/xfree86/utils/kbd_mode/Makefile.am +++ b/hw/xfree86/utils/kbd_mode/Makefile.am @@ -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@) diff --git a/hw/xfree86/utils/pcitweak/Makefile.am b/hw/xfree86/utils/pcitweak/Makefile.am index 2e0a691f0..2a242afbf 100644 --- a/hw/xfree86/utils/pcitweak/Makefile.am +++ b/hw/xfree86/utils/pcitweak/Makefile.am @@ -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@) diff --git a/hw/xfree86/utils/scanpci/Makefile.am b/hw/xfree86/utils/scanpci/Makefile.am index 45ed943db..bede5f064 100644 --- a/hw/xfree86/utils/scanpci/Makefile.am +++ b/hw/xfree86/utils/scanpci/Makefile.am @@ -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@) diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am index aa587f23c..aba175184 100644 --- a/hw/xfree86/utils/xorgcfg/Makefile.am +++ b/hw/xfree86/utils/xorgcfg/Makefile.am @@ -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@) diff --git a/hw/xfree86/utils/xorgconfig/Makefile.am b/hw/xfree86/utils/xorgconfig/Makefile.am index 848a4f4cd..e0930e189 100644 --- a/hw/xfree86/utils/xorgconfig/Makefile.am +++ b/hw/xfree86/utils/xorgconfig/Makefile.am @@ -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@) diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am index 8c92d3f9b..f646f1202 100644 --- a/hw/xnest/Makefile.am +++ b/hw/xnest/Makefile.am @@ -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@) |