diff options
| author | Alessio Treglia <alessio@debian.org> | 2012-06-03 00:47:50 +0200 |
|---|---|---|
| committer | Alessio Treglia <alessio@debian.org> | 2012-06-03 00:47:50 +0200 |
| commit | 2fc0bb47c780bf8dc80944b4fc3efac26d20a134 (patch) | |
| tree | 3cb02a9f74115673b5b64578cab09a6e33270d4b /configure | |
| parent | a9bb26f88284042eb37fddb631a7a1d57960653e (diff) | |
| parent | f61940ebd00dbbcfccf408fd93fb1ab2ec5c78d5 (diff) | |
Merge tag 'upstream/3.4.2'
Upstream version 3.4.2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -2735,7 +2735,7 @@ fi # Define the identity of the package. PACKAGE=simple-scan - VERSION=3.4.1 + VERSION=3.4.2 cat >>confdefs.h <<_ACEOF @@ -2805,7 +2805,7 @@ fi DISABLE_DEPRECATED="" if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" + DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP" for DOMAIN in $DOMAINS; do DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" done @@ -5206,8 +5206,10 @@ clean-help: rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) EXTRA_DIST ?= -EXTRA_DIST += $(_HELP_LC_STAMPS) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_POFILES) -EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(_HELP_LINGUAS),$(wildcard $(lc)/$(f)))) +EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) +EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) distdir: distdir-help-files distdir-help-files: |