From c2b0b2ae98e87b0c0010e672d7b03d320b4e982a Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 06 Apr 2007 13:36:52 +0000 Subject: Move data in the lib to the toplevel dir. --- diff --git a/configure.ac b/configure.ac index 585134f..dac28a4 100644 --- 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 diff --git a/data/Makefile.am b/data/Makefile.am index f03c96c..8fcadf5 100644 --- 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) diff --git a/lib/data/gecko-prefs.js b/data/gecko-prefs.js index ee61382..ee61382 100644 --- a/lib/data/gecko-prefs.js +++ b/data/gecko-prefs.js diff --git a/lib/data/mime.types b/data/mime.types index 0f76f39..0f76f39 100644 --- a/lib/data/mime.types +++ b/data/mime.types diff --git a/lib/Makefile.am b/lib/Makefile.am index 845b2c3..3021e12 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1 +1 @@ -SUBDIRS = data src python threadframe +SUBDIRS = src python threadframe diff --git a/lib/data/Makefile.am b/lib/data/Makefile.am deleted file mode 100644 index 122cf2e..0000000 --- a/lib/data/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -geckoconfdir = $(pkgdatadir) -geckoconf_DATA = gecko-prefs.js mime.types - -EXTRA_DIST = $(geckoconf_DATA) -- cgit v0.9.1