From c2b0b2ae98e87b0c0010e672d7b03d320b4e982a Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 6 Apr 2007 15:36:52 +0200 Subject: [PATCH] Move data in the lib to the toplevel dir. --- configure.ac | 1 - data/Makefile.am | 5 ++++- {lib/data => data}/gecko-prefs.js | 0 {lib/data => data}/mime.types | 0 lib/Makefile.am | 2 +- lib/data/Makefile.am | 4 ---- 6 files changed, 5 insertions(+), 7 deletions(-) rename {lib/data => data}/gecko-prefs.js (100%) rename {lib/data => data}/mime.types (100%) delete mode 100644 lib/data/Makefile.am diff --git a/configure.ac b/configure.ac index 585134f5..dac28a47 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 f03c96cc..8fcadf51 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 similarity index 100% rename from lib/data/gecko-prefs.js rename to data/gecko-prefs.js diff --git a/lib/data/mime.types b/data/mime.types similarity index 100% rename from lib/data/mime.types rename to data/mime.types diff --git a/lib/Makefile.am b/lib/Makefile.am index 845b2c33..3021e123 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 122cf2e3..00000000 --- a/lib/data/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -geckoconfdir = $(pkgdatadir) -geckoconf_DATA = gecko-prefs.js mime.types - -EXTRA_DIST = $(geckoconf_DATA)