package: get rid of database subdir

Not much point in a seperate subdir for only two packages.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

package/Config.in

@@ -232,8 +232,8 @@ endmenu
 
 menu "Database"
 source "package/berkeleydb/Config.in"
-source "package/database/mysql_client/Config.in"
-source "package/database/sqlite/Config.in"
+source "package/mysql_client/Config.in"
+source "package/sqlite/Config.in"
 endmenu
 
 menu "Filesystem"

package/database/Config.in

@@ -1,4 +0,0 @@
-menu "Database"
-source "package/database/mysql_client/Config.in"
-source "package/database/sqlite/Config.in"
-endmenu

package/database/database.mk

@@ -1 +0,0 @@
-include package/database/*/*.mk

package/database/mysql_client/Config.in → package/mysql_client/Config.in

@@ -1,5 +1,5 @@
 config BR2_PACKAGE_MYSQL_CLIENT
-	bool "MySQL 5.1 client"
+	bool "MySQL client"
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_READLINE

package/database/mysql_client/mysql_client.mk → package/mysql_client/mysql_client.mk

@@ -24,7 +24,7 @@ MYSQL_CLIENT_CONF_OPT = \
 	--enable-thread-safe-client \
 	$(ENABLE_DEBUG)
 
-$(eval $(call AUTOTARGETS,package/database,mysql_client))
+$(eval $(call AUTOTARGETS,package,mysql_client))
 
 $(MYSQL_CLIENT_HOOK_POST_INSTALL):
 	rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench