Support for variable DESTDIR. If set, all files are installed to that

location. Also print the filename of the installed file, not only the
path. Both changes are mostly for package creators/maintainers.
Henning Meier-Geinitz <henning@meier-geinitz.de>

backend/Makefile.in

@@ -135,16 +135,16 @@ libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
 all:	$(LIBS) libsane.la
 
 install:
-	$(MKDIR) $(libdir) $(libsanedir) $(configdir)
+	$(MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(libsanedir) $(DESTDIR)$(configdir)
 	@list="$(LIBS)"; for be in $$list; do \
-	  echo installing $${be} in $(libsanedir)...; \
+	  echo installing $${be} in $(libsanedir)/$${be}...; \
-	  $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) $${be} $(libsanedir)/$${be} \
+	  $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) $${be} \
-	    || exit 1; \
+              $(DESTDIR)$(libsanedir)/$${be} || exit 1; \
 	done
-	@$(LIBTOOL) $(MINST) --finish $(libsanedir)
+	@$(LIBTOOL) $(MINST) --finish $(DESTDIR)$(libsanedir)
 	@# Assume the dll name without any versions is last
 	@dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
-	list="$(ALL_BACKENDS)"; cd $(libsanedir) && for be in $$list; do \
+	list="$(ALL_BACKENDS)"; cd $(DESTDIR)$(libsanedir) && for be in $$list; do \
 	  file=libsane-$${be}.$$dllend.$(V_MAJOR); \
 	  lib=`grep dlname= libsane-$${be}.la | cut -f2 -d"'"`; \
 	  if test ! -f $${file} -a -n "$${lib}"; then \
@@ -153,22 +153,24 @@ install:
 	done
 	@# Assume the dll name without any versions is last
 	@dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
-	rm -f $(libdir)/libsane.a $(libdir)/libsane.$$dllend \
+	rm -f $(DESTDIR)$(libdir)/libsane.a $(DESTDIR)$(libdir)/libsane.$$dllend \
-		$(libdir)/libsane.$$dllend.$(V_MAJOR)*; \
+		$(DESTDIR)$(libdir)/libsane.$$dllend.$(V_MAJOR)*; \
-	$(LN_S) sane/libsane-dll.a $(libdir)/libsane.a; \
+	$(LN_S) sane/libsane-dll.a $(DESTDIR)$(libdir)/libsane.a; \
-	$(LN_S) sane/libsane-dll.$$dllend $(libdir)/libsane.$$dllend ; \
+	$(LN_S) sane/libsane-dll.$$dllend $(DESTDIR)$(libdir)/libsane.$$dllend ; \
-	cd $(libsanedir) && for n in libsane-dll.$$dllend.$(V_MAJOR)*; do \
+	cd $(DESTDIR)$(libsanedir) && for n in libsane-dll.$$dllend.$(V_MAJOR)*; do \
 	  nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \
 	  (cd ..; $(LN_S) sane/$$n $$nn); \
 	done || exit 1
-	$(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
+	$(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsane.la \
+          $(DESTDIR)$(libdir)/libsane.la
 	@list="$(CONFIGS)"; for cfg in $$list; do \
 	  if test ! -r $(srcdir)/$${cfg}; then continue; fi; \
-	  if test -f $(configdir)/$${cfg}; then \
+	  if test -f $(DESTDIR)$(configdir)/$${cfg}; then \
 	    echo NOT overwriting $${cfg} in $(configdir)...; \
 	  else \
-	    echo installing $${cfg} in $(configdir)...; \
+	    echo installing $${cfg} in $(configdir)/$${cfg}...; \
-	    $(INSTALL_DATA) $(srcdir)/$${cfg} $(configdir)/$${cfg} || exit 1; \
+	    $(INSTALL_DATA) $(srcdir)/$${cfg} $(DESTDIR)$(configdir)/$${cfg} \
+              || exit 1; \
 	  fi; \
 	done
 

doc/Makefile.in

@@ -98,37 +98,39 @@ all: sane.ps $(MANPAGES)
 	@echo Generating manpage $@...
 
 install: all
-	$(MKDIR) $(mandir)/man1 $(mandir)/man5 $(mandir)/man7
+	$(MKDIR) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 \
+           $(DESTDIR)$(mandir)/man7
 	@for page in $(SECT1); do \
 	  echo installing $${page} in $(mandir)/man1/$${page}...; \
-	  $(INSTALL_DATA) $${page} $(mandir)/man1/$${page} || exit 1; \
+	  $(INSTALL_DATA) $${page} $(DESTDIR)$(mandir)/man1/$${page} || exit 1; \
 	done
 	@for page in $(SECT5); do \
 	  echo installing $${page} in $(mandir)/man5/$${page}...; \
-	  $(INSTALL_DATA) $${page} $(mandir)/man5/$${page} || exit 1; \
+	  $(INSTALL_DATA) $${page} $(DESTDIR)$(mandir)/man5/$${page} || exit 1; \
 	done
 	@for page in $(SECT7); do \
 	  echo installing $${page} in $(mandir)/man7/$${page}...; \
-	  $(INSTALL_DATA) $${page} $(mandir)/man7/$${page} || exit 1; \
+	  $(INSTALL_DATA) $${page} $(DESTDIR)$(mandir)/man7/$${page} || exit 1; \
 	done
-	$(MKDIR) $(docdir)
+	$(MKDIR) $(DESTDIR)$(docdir)
 	@for readme in $(READMES); do \
 	  echo installing $${readme} in $(docdir)/$${readme}...; \
-	  $(INSTALL_DATA) $(top_srcdir)/$${readme} $(docdir)/$${readme} \
+	  $(INSTALL_DATA) $(top_srcdir)/$${readme} $(DESTDIR)$(docdir)/$${readme} \
 	    || exit 1; \
 	done
 	@for backdir in $(BACKDIRS); do \
-	  echo installing $${backdir} in $(docdir)/$${backdir}...; \
+	  $(MKDIR) $(DESTDIR)$(docdir)/$${backdir} ; \
-	  $(MKDIR) $(docdir)/$${backdir} ; \
 	  for doc in $${backdir}/* ; do \
 	    if test -f $${doc} ; then \
-	      $(INSTALL_DATA) $${doc} $(docdir)/$${backdir} || exit 1; \
+	      echo installing $${doc} in $(docdir)/$${doc}...; \
+	      $(INSTALL_DATA) $${doc} $(DESTDIR)$(docdir)/$${doc} \
+                || exit 1; \
 	    fi \
 	  done \
 	done
 	@-for doc in $(DOCS); do \
 	    echo installing $${doc} in $(docdir)/$${doc}...; \
-	    $(INSTALL_DATA) $${doc} $(docdir)/$${doc}; \
+	    $(INSTALL_DATA) $${doc} $(DESTDIR)$(docdir)/$${doc}; \
 	  done
 
 uninstall:

frontend/Makefile.in

@@ -71,14 +71,14 @@ DISTFILES = Makefile.in saned.c scanimage.c stiff.c stiff.h test.c
 all: $(PROGRAMS)
 
 install: $(PROGRAMS)
-	$(MKDIR) $(bindir) $(sbindir) $(datadir)
+	$(MKDIR) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(datadir)
 	@for program in $(BINPROGS); do \
 	  $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) $${program} \
-	    $(bindir)/$${program}; \
+	    $(DESTDIR)$(bindir)/$${program}; \
 	done
 	@for program in $(SBINPROGS); do \
 	  $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) $${program} \
-	    $(sbindir)/$${program}; \
+	    $(DESTDIR)$(sbindir)/$${program}; \
 	done
 
 uninstall:

include/Makefile.in

@@ -34,10 +34,9 @@ DISTCLEAN_FILES = @DISTCLEAN_FILES@
 
 @SET_MAKE@
 
-INSTALLED_INCLUDES = $(addprefix $(top_srcdir)/include/sane/,sane.h \
+INSTALLED_INCLUDES = sane.h saneopts.h
-	saneopts.h)
 
-SANE_INCLUDES = $(INSTALLED_INCLUDES) \
+SANE_INCLUDES = $(addprefix $(top_srcdir)/include/sane/,$(INSTALLED_INCLUDES)) \
                 $(addprefix $(top_srcdir)/include/sane/,config.h.in sanei.h \
                 sanei_ab306.h sanei_auth.h sanei_backend.h \
                 sanei_codec_ascii.h sanei_codec_bin.h sanei_config.h \
@@ -63,10 +62,11 @@ distclean: clean
 	rm -f sane/config.h
 
 install:
-	$(MKDIR) $(includedir)/sane
+	$(MKDIR) $(DESTDIR)$(includedir)/sane
 	@list="$(INSTALLED_INCLUDES)"; for file in $$list; do \
-	  echo installing $${file} in $(includedir)/sane...; \
+	  echo installing sane/$${file} in $(includedir)/sane/$${file}...; \
-	  $(INSTALL_DATA) $${file} $(includedir)/sane || exit 1; \
+	  $(INSTALL_DATA) sane/$${file} $(DESTDIR)$(includedir)/sane/$${file} \
+            || exit 1; \
 	done
 
 uninstall:

po/Makefile.in

@@ -106,9 +106,9 @@ $(addprefix install-,$(ALL_MOS)):
 	 backend=$(basename $(basename $(subst install-,,$@))) ; \
 	 lang=$(subst .,,$(suffix $(basename $(subst install-,,$@)))) ; \
 	 dir=$(gnulocaledir)/$${lang}/LC_MESSAGES ; \
-	 echo installing  $${mo_file} to $${dir}/sane-$${backend}.mo ; \
+	 echo installing  $${mo_file} to $${dir}/sane-$${backend}.mo... ; \
-	 $(MKDIR) $${dir} && \
+	 $(MKDIR) $(DESTDIR)$${dir} && \
-	 $(INSTALL_DATA) $${mo_file} $${dir}/sane-$${backend}.mo ;
+	 $(INSTALL_DATA) $${mo_file} $(DESTDIR)$${dir}/sane-$${backend}.mo ;
 
 install-translations: $(addprefix install-,$(ALL_MOS))
 

tools/Makefile.in

@@ -78,8 +78,8 @@ DISTFILES = Makefile.in README libtool-get-dll-ext mustek600iin-off.c \
 all:	$(DESTINATIONS)
 
 install: sane-config sane-find-scanner
-	$(INSTALL_SCRIPT) sane-config $(bindir)/sane-config
+	$(INSTALL_SCRIPT) sane-config $(DESTDIR)$(bindir)/sane-config
-	$(INSTALL_PROGRAM) sane-find-scanner $(bindir)/sane-find-scanner
+	$(INSTALL_PROGRAM) sane-find-scanner $(DESTDIR)$(bindir)/sane-find-scanner
 
 uninstall: 
 	rm -f $(bindir)/sane-config $(bindir)/sane-find-scanner