diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-27 08:20:20 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-27 08:20:20 +0200 |
commit | e94622c319e4307617b202f19d3ec05b21a9bb49 (patch) | |
tree | c5ddf44352b9bd47aeb3eb432ba79638079efe25 /tools/Makefile.am | |
parent | 6f2255c9648b175d51e2c8e5e9670557f9dc4ee1 (diff) |
merge to 1.0.25+git20150927
Diffstat (limited to 'tools/Makefile.am')
-rw-r--r-- | tools/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 7c2a616..2024180 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -8,7 +8,12 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \ -I$(top_srcdir)/include bin_PROGRAMS = sane-find-scanner gamma4scanimage -noinst_PROGRAMS = sane-desc umax_pp +noinst_PROGRAMS = sane-desc +if INSTALL_UMAX_PP_TOOLS +bin_PROGRAMS = umax_pp +else +noinst_PROGRAMS = umax_pp +endif if CROSS_COMPILING HOTPLUG = |