Alexandre Julliard : tools: Move winemaker to its own directory.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e619a15ac13a7fafe5e7d024c69256b8cb6458a4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e619a15ac13a7fafe5e7d024c6...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Oct 28 19:47:24 2015 +0900

tools: Move winemaker to its own directory.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 configure                                       |  3 ++-
 configure.ac                                    |  3 ++-
 tools/Makefile.in                               | 13 -------------
 tools/winemaker/Makefile.in                     | 12 ++++++++++++
 tools/{ => winemaker}/winemaker                 |  0
 tools/{ => winemaker}/winemaker.de.UTF-8.man.in |  0
 tools/{ => winemaker}/winemaker.fr.UTF-8.man.in |  0
 tools/{ => winemaker}/winemaker.man.in          |  0
 8 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/configure b/configure
index fd09324..534afff 100755
--- a/configure
+++ b/configure
@@ -18151,12 +18151,13 @@ wine_fn_config_program wusa enable_wusa install
 wine_fn_config_program xcopy enable_xcopy install,po
 wine_fn_config_test programs/xcopy/tests xcopy.exe_test
 wine_fn_config_makefile server enable_server clean,install-lib,manpage
-wine_fn_config_tool tools clean,install-dev,manpage
+wine_fn_config_tool tools clean
 wine_fn_config_tool tools/sfnt2fon clean
 wine_fn_config_tool tools/widl clean,install-dev,manpage
 wine_fn_config_tool tools/winebuild clean,install-dev,manpage
 wine_fn_config_tool tools/winedump clean,install-dev,manpage
 wine_fn_config_tool tools/winegcc clean,install-dev,manpage
+wine_fn_config_tool tools/winemaker install-dev,manpage
 wine_fn_config_tool tools/wmc clean,install-dev,manpage
 wine_fn_config_tool tools/wrc clean,install-dev,manpage
 
diff --git a/configure.ac b/configure.ac
index 3180407..cdc68fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3600,12 +3600,13 @@ WINE_CONFIG_PROGRAM(wusa,,[install])
 WINE_CONFIG_PROGRAM(xcopy,,[install,po])
 WINE_CONFIG_TEST(programs/xcopy/tests)
 WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage])
-WINE_CONFIG_TOOL(tools,[clean,install-dev,manpage])
+WINE_CONFIG_TOOL(tools,[clean])
 WINE_CONFIG_TOOL(tools/sfnt2fon,[clean])
 WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage])
 WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev,manpage])
 WINE_CONFIG_TOOL(tools/winedump,[clean,install-dev,manpage])
 WINE_CONFIG_TOOL(tools/winegcc,[clean,install-dev,manpage])
+WINE_CONFIG_TOOL(tools/winemaker,[install-dev,manpage])
 WINE_CONFIG_TOOL(tools/wmc,[clean,install-dev,manpage])
 WINE_CONFIG_TOOL(tools/wrc,[clean,install-dev,manpage])
 
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 2ed8179..bc13cc9 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,11 +1,6 @@
 PROGRAMS = \
 	make_xftmpl
 
-MANPAGES = \
-	winemaker.de.UTF-8.man.in \
-	winemaker.fr.UTF-8.man.in \
-	winemaker.man.in
-
 C_SRCS = \
 	make_xftmpl.c
 
@@ -13,11 +8,3 @@ IN_SRCS = \
 	wineapploader.in
 
 all: wineapploader
-
-.PHONY: install install-dev uninstall
-
-install install-dev:: install-man-pages
-	$(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker
-
-uninstall::
-	$(RM) $(DESTDIR)$(bindir)/winemaker
diff --git a/tools/winemaker/Makefile.in b/tools/winemaker/Makefile.in
new file mode 100644
index 0000000..7095ecf
--- /dev/null
+++ b/tools/winemaker/Makefile.in
@@ -0,0 +1,12 @@
+MANPAGES = \
+	winemaker.de.UTF-8.man.in \
+	winemaker.fr.UTF-8.man.in \
+	winemaker.man.in
+
+.PHONY: install install-dev uninstall
+
+install install-dev:: install-man-pages
+	$(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker
+
+uninstall::
+	$(RM) $(DESTDIR)$(bindir)/winemaker
diff --git a/tools/winemaker b/tools/winemaker/winemaker
similarity index 100%
rename from tools/winemaker
rename to tools/winemaker/winemaker
diff --git a/tools/winemaker.de.UTF-8.man.in b/tools/winemaker/winemaker.de.UTF-8.man.in
similarity index 100%
rename from tools/winemaker.de.UTF-8.man.in
rename to tools/winemaker/winemaker.de.UTF-8.man.in
diff --git a/tools/winemaker.fr.UTF-8.man.in b/tools/winemaker/winemaker.fr.UTF-8.man.in
similarity index 100%
rename from tools/winemaker.fr.UTF-8.man.in
rename to tools/winemaker/winemaker.fr.UTF-8.man.in
diff --git a/tools/winemaker.man.in b/tools/winemaker/winemaker.man.in
similarity index 100%
rename from tools/winemaker.man.in
rename to tools/winemaker/winemaker.man.in