[Pkg-isocodes-devel] [iso-codes] 01/02: Install the JSON data
Tobias Quathamer
toddy at moszumanska.debian.org
Wed Mar 2 10:39:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
toddy pushed a commit to branch master
in repository iso-codes.
commit 43d21ed98785d53ff316782547e13cad00ac670c
Author: Dr. Tobias Quathamer <toddy at debian.org>
Date: Wed Mar 2 10:59:57 2016 +0100
Install the JSON data
---
Makefile.am | 4 ++++
Makefile.in | 54 ++++++++++++++++++++++++++++++++++++++++--------------
2 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f8feee9..3eba794 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,10 @@ SUBDIRS = iso_639 iso_639_3 iso_639_5 iso_3166 iso_3166_2 iso_4217 iso_15924
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = iso-codes.pc
+# For this release, just install the JSON files.
+jsondir = $(pkgdatadir)/json
+dist_json_DATA = $(wildcard $(srcdir)/data/*.json)
+
EXTRA_DIST = \
LICENSE \
common.mk \
diff --git a/Makefile.in b/Makefile.in
index cad20cd..d2985c6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,7 +92,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(am__DIST_COMMON)
+ $(am__configure_deps) $(dist_json_DATA) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -152,8 +152,8 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-DATA = $(pkgconfig_DATA)
+am__installdirs = "$(DESTDIR)$(jsondir)" "$(DESTDIR)$(pkgconfigdir)"
+DATA = $(dist_json_DATA) $(pkgconfig_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
@@ -312,6 +312,10 @@ top_srcdir = @top_srcdir@
SUBDIRS = iso_639 iso_639_3 iso_639_5 iso_3166 iso_3166_2 iso_4217 iso_15924
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = iso-codes.pc
+
+# For this release, just install the JSON files.
+jsondir = $(pkgdatadir)/json
+dist_json_DATA = $(wildcard $(srcdir)/data/*.json)
EXTRA_DIST = \
LICENSE \
common.mk \
@@ -357,6 +361,27 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
iso-codes.pc: $(top_builddir)/config.status $(srcdir)/iso-codes.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+install-dist_jsonDATA: $(dist_json_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(dist_json_DATA)'; test -n "$(jsondir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(jsondir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(jsondir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(jsondir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(jsondir)" || exit $$?; \
+ done
+
+uninstall-dist_jsonDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_json_DATA)'; test -n "$(jsondir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(jsondir)'; $(am__uninstall_files_from_dir)
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
@@ -677,7 +702,7 @@ check: check-recursive
all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
+ for dir in "$(DESTDIR)$(jsondir)" "$(DESTDIR)$(pkgconfigdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -732,7 +757,7 @@ info: info-recursive
info-am:
-install-data-am: install-pkgconfigDATA
+install-data-am: install-dist_jsonDATA install-pkgconfigDATA
install-dvi: install-dvi-recursive
@@ -778,7 +803,7 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-pkgconfigDATA
+uninstall-am: uninstall-dist_jsonDATA uninstall-pkgconfigDATA
.MAKE: $(am__recursive_targets) install-am install-strip
@@ -789,14 +814,15 @@ uninstall-am: uninstall-pkgconfigDATA
distcheck distclean distclean-generic distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-pkgconfigDATA install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
- uninstall-am uninstall-pkgconfigDATA
+ install-data-am install-dist_jsonDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-dist_jsonDATA uninstall-pkgconfigDATA
.PRECIOUS: Makefile
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-isocodes/iso-codes.git
More information about the Pkg-isocodes-devel
mailing list