summaryrefslogtreecommitdiff
path: root/data/Makefile.in
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-05-21 06:24:54 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-05-21 06:24:54 +0200
commit2d3786309780c22628c7e9d9ce4d6db97c437026 (patch)
treeb0705e10a7d8b77216cde0c757447b1234f9d095 /data/Makefile.in
parent7180d98f3a1b400efb6060e88d9f27bdc24184bf (diff)
parent53ff7b09f2995edfbd52b9789fe2dfe015e6c4a3 (diff)
Merge tag 'upstream/3.17.1.1'
Upstream version 3.17.1.1
Diffstat (limited to 'data/Makefile.in')
-rw-r--r--data/Makefile.in60
1 files changed, 16 insertions, 44 deletions
diff --git a/data/Makefile.in b/data/Makefile.in
index 6031c4e..dedafd0 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -141,11 +141,10 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)" \
- "$(DESTDIR)$(desktopdir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)"
NROFF = nroff
MANS = $(dist_man1_MANS)
-DATA = $(appdata_DATA) $(desktop_DATA)
+DATA = $(desktop_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
@@ -324,15 +323,12 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = icons
+SUBDIRS = icons appdata
desktopdir = $(datadir)/applications
desktop_DATA = simple-scan.desktop
-appdatadir = $(datadir)/appdata
-appdata_DATA = simple-scan.appdata.xml
gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
dist_man1_MANS = simple-scan.1
EXTRA_DIST = simple-scan.desktop.in \
- simple-scan.appdata.xml.in \
org.gnome.SimpleScan.gschema.xml.in \
simple-scan.ui \
simple-scan.gresource.xml
@@ -341,7 +337,6 @@ DISTCLEANFILES = \
Makefile.in \
$(schema_DATA) \
$(desktop_DATA) \
- $(appdata_DATA) \
$(gsettings_SCHEMAS)
all: all-recursive
@@ -418,27 +413,6 @@ uninstall-man1:
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-appdataDATA: $(appdata_DATA)
- @$(NORMAL_INSTALL)
- @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || 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)$(appdatadir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
- done
-
-uninstall-appdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
@@ -620,7 +594,7 @@ check: check-recursive
all-am: Makefile $(MANS) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(desktopdir)"; do \
+ for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -674,7 +648,7 @@ info: info-recursive
info-am:
-install-data-am: install-appdataDATA install-desktopDATA install-man
+install-data-am: install-desktopDATA install-man
install-dvi: install-dvi-recursive
@@ -718,8 +692,7 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-appdataDATA uninstall-desktopDATA \
- uninstall-man
+uninstall-am: uninstall-desktopDATA uninstall-man
uninstall-man: uninstall-man1
@@ -728,20 +701,19 @@ uninstall-man: uninstall-man1
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
check-am clean clean-generic cscopelist-am ctags ctags-am \
distclean distclean-generic distclean-tags distdir dvi dvi-am \
- html html-am info info-am install install-am \
- install-appdataDATA install-data install-data-am \
- install-desktopDATA install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-man1 install-pdf \
- install-pdf-am 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-appdataDATA uninstall-desktopDATA \
+ html html-am info info-am install install-am install-data \
+ install-data-am install-desktopDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am 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-desktopDATA \
uninstall-man uninstall-man1
@INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_XML_RULE@
+@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@
# Tell versions [3.59,3.63) of GNU make to not export all variables.