null+****@clear*****
null+****@clear*****
2010年 8月 20日 (金) 14:19:04 JST
Kouhei Sutou 2010-08-20 05:19:04 +0000 (Fri, 20 Aug 2010)
New Revision: 9ac9ed9ede6cb8aabdd17c2ec08a9c9d13eab3a6
Log:
install resource by resource/Makefile.am instead of custom target.
Added files:
resource/Makefile.am
Modified files:
Makefile.am
configure.ac
Modified: Makefile.am (+2 -11)
===================================================================
--- Makefile.am 2010-08-20 03:11:44 +0000 (eccc52c)
+++ Makefile.am 2010-08-20 05:19:04 +0000 (11aa837)
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = 1.9.7
-SUBDIRS = lib modules src examples test apt data
+SUBDIRS = lib modules src examples test apt data resource
#dist_data_DATA =
-EXTRA_DIST = bindings resource doc/ja version-gen.sh
+EXTRA_DIST = bindings doc/ja version-gen.sh
pkginclude_HEADERS = groonga.h
pkgconfigdir = $(libdir)/pkgconfig
@@ -25,15 +25,6 @@ dist-hook:
rm -rf $(distdir)/doc/ja/source
echo "$(GROONGA_VERSION)" > $(distdir)/version
-install-data-local:
- @$(NORMAL_INSTALL)
- test -z "$(DESTDIR)$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- cp -R "$(srcdir)"/resource/* $(DESTDIR)$(pkgdatadir)
-
-uninstall-local:
- @$(NORMAL_UNINSTALL)
- rm -rf $(DESTDIR)$(pkgdatadir)
-
benchmark:
cd test/benchmark && $(MAKE) $(AM_MAKEFLAGS) benchmark
Modified: configure.ac (+1 -0)
===================================================================
--- configure.ac 2010-08-20 03:11:44 +0000 (082e4f7)
+++ configure.ac 2010-08-20 05:19:04 +0000 (4ca44fb)
@@ -96,6 +96,7 @@ AC_CONFIG_FILES([Makefile
apt/Makefile
data/Makefile
data/munin/Makefile
+ resource/Makefile
test/Makefile
test/unit/Makefile
test/unit/lib/Makefile
Added: resource/Makefile.am (+22 -0) 100644
===================================================================
--- /dev/null
+++ resource/Makefile.am 2010-08-20 05:19:04 +0000 (97848dd)
@@ -0,0 +1,22 @@
+# find admin_html -type f | sort | sed -e 's,^,\t,g'
+nobase_dist_pkgdata_DATA = \
+ admin_html/css/admin.css \
+ admin_html/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png \
+ admin_html/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png \
+ admin_html/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png \
+ admin_html/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png \
+ admin_html/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png \
+ admin_html/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png \
+ admin_html/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png \
+ admin_html/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png \
+ admin_html/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png \
+ admin_html/css/ui-lightness/images/ui-icons_222222_256x240.png \
+ admin_html/css/ui-lightness/images/ui-icons_228ef1_256x240.png \
+ admin_html/css/ui-lightness/images/ui-icons_ef8c08_256x240.png \
+ admin_html/css/ui-lightness/images/ui-icons_ffd27a_256x240.png \
+ admin_html/css/ui-lightness/images/ui-icons_ffffff_256x240.png \
+ admin_html/css/ui-lightness/jquery-ui-1.8.1.custom.css \
+ admin_html/images/groonga.png \
+ admin_html/index.html \
+ admin_html/js/jquery-1.4.2.min.js \
+ admin_html/js/jquery-ui-1.8.1.custom.min.js