summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--hw/xquartz/Makefile.am4
-rw-r--r--hw/xquartz/man/Makefile.am (renamed from hw/xquartz/doc/Makefile.am)0
-rw-r--r--hw/xquartz/man/Xquartz.man (renamed from hw/xquartz/doc/Xquartz.man)0
4 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 41d6e6605..45286eaf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2256,7 +2256,7 @@ hw/xwin/man/Makefile
hw/xquartz/Makefile
hw/xquartz/GL/Makefile
hw/xquartz/bundle/Makefile
-hw/xquartz/doc/Makefile
+hw/xquartz/man/Makefile
hw/xquartz/mach-startup/Makefile
hw/xquartz/pbproxy/Makefile
hw/xquartz/xpr/Makefile
diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 96b1fb0c5..61b04e0e1 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -14,9 +14,9 @@ if GLX
GL_DIR = GL
endif
-SUBDIRS = bundle . $(GL_DIR) xpr pbproxy mach-startup doc
+SUBDIRS = bundle . $(GL_DIR) xpr pbproxy mach-startup man
-DIST_SUBDIRS = bundle . GL xpr pbproxy mach-startup doc
+DIST_SUBDIRS = bundle . GL xpr pbproxy mach-startup man
libXquartz_la_SOURCES = \
$(top_srcdir)/fb/fbcmap_mi.c \
diff --git a/hw/xquartz/doc/Makefile.am b/hw/xquartz/man/Makefile.am
index 5a0cde7cc..5a0cde7cc 100644
--- a/hw/xquartz/doc/Makefile.am
+++ b/hw/xquartz/man/Makefile.am
diff --git a/hw/xquartz/doc/Xquartz.man b/hw/xquartz/man/Xquartz.man
index 447194740..447194740 100644
--- a/hw/xquartz/doc/Xquartz.man
+++ b/hw/xquartz/man/Xquartz.man