xapp_xinput-calibrator: rename directory to match .mk name

The directory was named xapp_xinput_calibrator, but the .mk file was
named xapp_xinput-calibrator.mk, which isn't consistent. Rename the
directory to xapp_xinput-calibrator to be consistent with the naming
of the .mk file and the other x11r7 directories.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 94ad8a4d1a5e121ca9f49a2bf5ecd3e8fb1fe2ea..6881d4ed95965ecc4be299f0a065709aab4c631e 100644 (file)
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -132,7 +132,7 @@ endmenu
                source package/x11r7/xapp_xhost/Config.in
                source package/x11r7/xapp_xinit/Config.in
                source package/x11r7/xapp_xinput/Config.in
-               source package/x11r7/xapp_xinput_calibrator/Config.in
+               source package/x11r7/xapp_xinput-calibrator/Config.in
                source package/x11r7/xapp_xkbcomp/Config.in
                source package/x11r7/xapp_xkbevd/Config.in
                source package/x11r7/xapp_xkbprint/Config.in

diff --git a/package/x11r7/xapp_xinput-calibrator/Config.in b/package/x11r7/xapp_xinput-calibrator/Config.in
new file mode 100644 (file)
index 0000000..ac98b8d
--- /dev/null
+++ b/package/x11r7/xapp_xinput-calibrator/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_XAPP_XINPUT_CALIBRATOR
+       bool "xinput-calibrator"
+       depends on BR2_INSTALL_LIBSTDCPP
+       select BR2_PACKAGE_XLIB_LIBX11
+       select BR2_PACKAGE_XLIB_LIBXI
+       help
+         A generic touchscreen calibration program for X.Org.
+
+         http://www.freedesktop.org/wiki/Software/xinput_calibrator
+
+comment "xinput-calibrator requires a toolchain with C++ support"
+       depends on !BR2_INSTALL_LIBSTDCPP

diff --git a/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk b/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk
new file mode 100644 (file)
index 0000000..659d62a
--- /dev/null
+++ b/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# xapp_xinput-calibrator
+#
+################################################################################
+
+XAPP_XINPUT_CALIBRATOR_VERSION = 0.7.5
+XAPP_XINPUT_CALIBRATOR_SOURCE = xinput_calibrator-$(XAPP_XINPUT_CALIBRATOR_VERSION).tar.gz
+XAPP_XINPUT_CALIBRATOR_SITE = http://github.com/downloads/tias/xinput_calibrator
+XAPP_XINPUT_CALIBRATOR_DEPENDENCIES = xlib_libX11 xlib_libXi
+
+$(eval $(autotools-package))

diff --git a/package/x11r7/xapp_xinput_calibrator/Config.in b/package/x11r7/xapp_xinput_calibrator/Config.in
deleted file mode 100644 (file)
index ac98b8d..0000000
--- a/package/x11r7/xapp_xinput_calibrator/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_XAPP_XINPUT_CALIBRATOR
-       bool "xinput-calibrator"
-       depends on BR2_INSTALL_LIBSTDCPP
-       select BR2_PACKAGE_XLIB_LIBX11
-       select BR2_PACKAGE_XLIB_LIBXI
-       help
-         A generic touchscreen calibration program for X.Org.
-
-         http://www.freedesktop.org/wiki/Software/xinput_calibrator
-
-comment "xinput-calibrator requires a toolchain with C++ support"
-       depends on !BR2_INSTALL_LIBSTDCPP

diff --git a/package/x11r7/xapp_xinput_calibrator/xapp_xinput-calibrator.mk b/package/x11r7/xapp_xinput_calibrator/xapp_xinput-calibrator.mk
deleted file mode 100644 (file)
index 659d62a..0000000
--- a/package/x11r7/xapp_xinput_calibrator/xapp_xinput-calibrator.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xapp_xinput-calibrator
-#
-################################################################################
-
-XAPP_XINPUT_CALIBRATOR_VERSION = 0.7.5
-XAPP_XINPUT_CALIBRATOR_SOURCE = xinput_calibrator-$(XAPP_XINPUT_CALIBRATOR_VERSION).tar.gz
-XAPP_XINPUT_CALIBRATOR_SITE = http://github.com/downloads/tias/xinput_calibrator
-XAPP_XINPUT_CALIBRATOR_DEPENDENCIES = xlib_libX11 xlib_libXi
-
-$(eval $(autotools-package))