Move data in the lib to the toplevel dir.

17 years ago · c2b0b2ae98
parent 49ff2f86de
commit c2b0b2ae98
6 changed files with 5 additions and 7 deletions
--- a/configure.ac
+++ b/configure.ac
@ -119,7 +119,6 @@ Makefile
 bin/Makefile
 data/Makefile
 lib/Makefile
-lib/data/Makefile
 lib/src/Makefile
 lib/python/Makefile
 lib/threadframe/Makefile
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -1,4 +1,7 @@
 sugardir = $(pkgdatadir)
-sugar_DATA = gtkrc
+sugar_DATA =
+	gtkrc		\
+	gecko-prefs.js	\
+	mime.types

 EXTRA_DIST = $(sugar_DATA)
--- a/lib/data/gecko-prefs.js
+++ b/lib/data/gecko-prefs.js
--- a/lib/data/mime.types
+++ b/lib/data/mime.types
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@ -1 +1 @@
-SUBDIRS = data src python threadframe
+SUBDIRS = src python threadframe
--- a/lib/data/Makefile.am
+++ b/lib/data/Makefile.am
@ -1,4 +0,0 @@
-geckoconfdir = $(pkgdatadir)
-geckoconf_DATA = gecko-prefs.js mime.types
-
-EXTRA_DIST = $(geckoconf_DATA)