summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-04-26 19:57:11 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-04-26 19:57:11 (GMT)
commit187f0a55323437e33f5a66ef670fe0e49f52bc45 (patch)
treec90a6c5afa2ae97c6c73d2e8ae0e64c195407665
parent28200ca3f233480de4179e58099ba5c9f335087c (diff)
downloadbuildroot-187f0a55323437e33f5a66ef670fe0e49f52bc45.tar.gz
buildroot-187f0a55323437e33f5a66ef670fe0e49f52bc45.tar.bz2
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>
-rw-r--r--package/Config.in4
-rw-r--r--package/database/Config.in4
-rw-r--r--package/database/database.mk1
-rw-r--r--package/mysql_client/Config.in (renamed from package/database/mysql_client/Config.in)2
-rw-r--r--package/mysql_client/mysql_client.mk (renamed from package/database/mysql_client/mysql_client.mk)2
-rw-r--r--package/sqlite/Config.in (renamed from package/database/sqlite/Config.in)0
-rw-r--r--package/sqlite/sqlite.mk (renamed from package/database/sqlite/sqlite.mk)0
7 files changed, 4 insertions, 9 deletions
diff --git a/package/Config.in b/package/Config.in
index a4ef362..15f6c3e 100644
--- a/package/Config.in
+++ b/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"
diff --git a/package/database/Config.in b/package/database/Config.in
deleted file mode 100644
index 029b7cd..0000000
--- a/package/database/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-menu "Database"
-source "package/database/mysql_client/Config.in"
-source "package/database/sqlite/Config.in"
-endmenu
diff --git a/package/database/database.mk b/package/database/database.mk
deleted file mode 100644
index 9553847..0000000
--- a/package/database/database.mk
+++ /dev/null
@@ -1 +0,0 @@
-include package/database/*/*.mk
diff --git a/package/database/mysql_client/Config.in b/package/mysql_client/Config.in
index 92b349a..f07fdb4 100644
--- a/package/database/mysql_client/Config.in
+++ b/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
diff --git a/package/database/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index 7f3b091..4403653 100644
--- a/package/database/mysql_client/mysql_client.mk
+++ b/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
diff --git a/package/database/sqlite/Config.in b/package/sqlite/Config.in
index f9b12ae..f9b12ae 100644
--- a/package/database/sqlite/Config.in
+++ b/package/sqlite/Config.in
diff --git a/package/database/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 375ab42..375ab42 100644
--- a/package/database/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk