Imported Debian patch 0.99-1debian/0.99-1

1 files changed, 59 insertions, 24 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 8df620f..5debbbb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -49,6 +49,9 @@ LIBLIB = ../lib/liblib.a
 
 XSANE_OBJS = xsane-back-gtk.o xsane-front-gtk.o xsane-gamma.o \
              xsane-preview.o xsane-viewer.o \
+             xsane-fax-project.o \
+             xsane-email-project.o \
+             xsane-multipage-project.o \
              xsane-rc-io.o xsane-device-preferences.o xsane-batch-scan.o \
              xsane-preferences.o xsane-setup.o xsane-save.o xsane-scan.o \
              xsane-icons.o xsane.o @XSANE_ICON@
@@ -60,37 +63,37 @@ XSANE_OBJS = xsane-back-gtk.o xsane-front-gtk.o xsane-gamma.o \
 all: $(PROGRAMS)
 
 install: $(PROGRAMS)
-	$(MKINSTALLDIRS) $(bindir) $(sbindir) $(datadir) $(sanedatadir) $(xsanedocdir) $(sanedatadir)/xsane
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(datadir) $(DESTDIR)$(sanedatadir) $(DESTDIR)$(xsanedocdir) $(DESTDIR)$(sanedatadir)/xsane
 	@for program in $(BINPROGS); do \
-	  $(INSTALL_PROGRAM) $${program} $(bindir)/$${program}; \
+	  $(INSTALL_PROGRAM) $${program} $(DESTDIR)$(bindir)/$${program}; \
 	done
-	$(INSTALL_DATA) $(srcdir)/xsane-style.rc $(sanedatadir)/xsane/xsane-style.rc
-	$(INSTALL_DATA) $(srcdir)/xsane-startimage.pnm $(sanedatadir)/xsane/xsane-startimage.pnm
-	$(INSTALL_DATA) $(srcdir)/xsane-calibration.pnm $(sanedatadir)/xsane/xsane-calibration.pnm
-	$(INSTALL_DATA) $(srcdir)/xsane-logo.xpm $(sanedatadir)/xsane/xsane-logo.xpm
-	$(INSTALL_DATA) $(srcdir)/xsane-gpl.txt $(sanedatadir)/xsane/xsane-gpl.txt
-	$(INSTALL_DATA) $(srcdir)/xsane-eula.txt $(sanedatadir)/xsane/xsane-eula.txt
+	$(INSTALL_DATA) $(srcdir)/xsane-style.rc $(DESTDIR)$(sanedatadir)/xsane/xsane-style.rc
+	$(INSTALL_DATA) $(srcdir)/xsane-startimage.pnm $(DESTDIR)$(sanedatadir)/xsane/xsane-startimage.pnm
+	$(INSTALL_DATA) $(srcdir)/xsane-calibration.pnm $(DESTDIR)$(sanedatadir)/xsane/xsane-calibration.pnm
+	$(INSTALL_DATA) $(srcdir)/xsane-logo.xpm $(DESTDIR)$(sanedatadir)/xsane/xsane-logo.xpm
+	$(INSTALL_DATA) $(srcdir)/xsane-gpl.txt $(DESTDIR)$(sanedatadir)/xsane/xsane-gpl.txt
+	$(INSTALL_DATA) $(srcdir)/xsane-eula.txt $(DESTDIR)$(sanedatadir)/xsane/xsane-eula.txt
 	@for logo in *-logo.xpm; do \
-	  echo installing $(sanedatadir)/xsane/$${logo}; \
-	  $(INSTALL_DATA) $(srcdir)/$${logo} $(sanedatadir)/xsane/$${logo}; \
+	  echo installing $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
+	  $(INSTALL_DATA) $(srcdir)/$${logo} $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
 	done 
 
 uninstall:
 	@for program in $(BINPROGS); do \
-	  echo uninstalling $(bindir)/$${program}...; \
-	  rm -f $(bindir)/$${program}; \
+	  echo uninstalling $(DESTDIR)$(bindir)/$${program}...; \
+	  rm -f $(DESTDIR)$(bindir)/$${program}; \
 	done
-	echo uninstalling $(sanedatadir)/xsane/xsane-style.rc...
-	rm -f $(sanedatadir)/xsane/xsane-style.rc
-	echo uninstalling $(sanedatadir)/xsane/xsane-startimage.pnm...
-	rm -f $(sanedatadir)/xsane/xsane-startimage.pnm
-	echo uninstalling $(sanedatadir)/xsane/xsane-calibration.pnm...
-	rm -f $(sanedatadir)/xsane/xsane-calibration.pnm
-	echo uninstalling $(sanedatadir)/xsane/xsane-logo.xpm...
-	rm -f $(sanedatadir)/xsane/xsane-logo.xpm
+	echo uninstalling $(DESTDIR)$(sanedatadir)/xsane/xsane-style.rc...
+	rm -f $(DESTDIR)$(sanedatadir)/xsane/xsane-style.rc
+	echo uninstalling $(DESTDIR)$(sanedatadir)/xsane/xsane-startimage.pnm...
+	rm -f $(DESTDIR)$(sanedatadir)/xsane/xsane-startimage.pnm
+	echo uninstalling $(DESTDIR)$(sanedatadir)/xsane/xsane-calibration.pnm...
+	rm -f $(DESTDIR)$(sanedatadir)/xsane/xsane-calibration.pnm
+	echo uninstalling $(DESTDIR)$(sanedatadir)/xsane/xsane-logo.xpm...
+	rm -f $(DESTDIR)$(sanedatadir)/xsane/xsane-logo.xpm
 	@for logo in *-logo.xpm; do \
-	  echo uninstalling $(sanedatadir)/xsane/$${logo}; \
-	  rm -f $(sanedatadir)/xsane/$${logo}; \
+	  echo uninstalling $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
+	  rm -f $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
 	done 
 
 xsane: $(XSANE_OBJS) $(LIBLIB)
@@ -125,12 +128,17 @@ xsane.o: xsane-device-preferences.h
 xsane.o: xsane-preferences.h
 xsane.o: xsane-icons.h
 xsane.o: xsane-batch-scan.h
+xsane.o: xsane-multipage-project.h
+xsane.o: xsane-fax-project.h
+xsane.o: xsane-email-project.h
+xsane.o: xsane-text.h
 
 xsane-back-gtk.o: xsane.h
 xsane-back-gtk.o: xsane-back-gtk.h
 xsane-back-gtk.o: xsane-front-gtk.h
 xsane-back-gtk.o: xsane-preferences.h
 xsane-back-gtk.o: xsane-gamma.h
+xsane-back-gtk.o: xsane-text.h
 
 xsane-front-gtk.o: xsane.h
 xsane-front-gtk.o: xsane-back-gtk.h
@@ -139,6 +147,7 @@ xsane-front-gtk.o: xsane-preview.h
 xsane-front-gtk.o: xsane-save.h
 xsane-front-gtk.o: xsane-gamma.h
 xsane-front-gtk.o: xsane-setup.h
+xsane-front-gtk.o: xsane-text.h
 
 xsane-batch-scan.o: xsane.h
 xsane-batch-scan.o: xsane-scan.h
@@ -148,6 +157,7 @@ xsane-batch-scan.o: xsane-front-gtk.h
 xsane-batch-scan.o: xsane-rc-io.h
 xsane-batch-scan.o: xsane-preview.h
 xsane-batch-scan.o: xsane-gamma.h
+xsane-batch-scan.o: xsane-text.h
 
 xsane-preview.o: xsane.h
 xsane-preview.o: xsane-back-gtk.h
@@ -156,6 +166,7 @@ xsane-preview.o: xsane-batch-scan.h
 xsane-preview.o: xsane-preview.h
 xsane-preview.o: xsane-preferences.h
 xsane-preview.o: xsane-gamma.h
+xsane-preview.o: xsane-text.h
 
 xsane-preferecnes.o: xsane.h
 xsane-preferecnes.o: xsane-preferences.h
@@ -183,6 +194,8 @@ xsane-scan.o: xsane-viewer.h
 xsane-scan.o: xsane-save.h
 xsane-scan.o: xsane-gamma.h
 xsane-scan.o: xsane-setup.h
+xsane-scan.o: xsane-email-project.h
+xsane-scan.o: xsane-text.h
 
 xsane-gamma.o: xsane.h
 xsane-gamma.o: xsane-back-gtk.h
@@ -190,6 +203,7 @@ xsane-gamma.o: xsane-front-gtk.h
 xsane-gamma.o: xsane-preferences.h
 xsane-gamma.o: xsane-preview.h
 xsane-gamma.o: xsane-save.h
+xsane-gamma.o: xsane-text.h
 
 xsane-setup.o: xsane.h
 xsane-setup.o: xsane-back-gtk.h
@@ -200,6 +214,7 @@ xsane-setup.o: xsane-preview.h
 xsane-setup.o: xsane-save.h
 xsane-setup.o: xsane-gamma.h
 xsane-setup.o: xsane-batch-scan.h
+xsane-setup.o: xsane-text.h
 
 xsane-viewer.o: xsane.h
 xsane-viewer.o: xsane-back-gtk.h
@@ -209,6 +224,26 @@ xsane-viewer.o: xsane-viewer.h
 xsane-viewer.o: xsane-gamma.h
 xsane-viewer.o: xsane-icons.h
 xsane-viewer.o: xsane-save.h
-
-
+xsane-viewer.o: xsane-text.h
+
+xsane-multipage-project.o: xsane.h
+xsane-multipage-project.o: xsane-back-gtk.h
+xsane-multipage-project.o: xsane-front-gtk.h
+xsane-multipage-project.o: xsane-preferences.h
+xsane-multipage-project.o: xsane-multipage-project.h
+xsane-multipage-project.o: xsane-text.h
+
+xsane-fax-project.o: xsane.h
+xsane-fax-project.o: xsane-back-gtk.h
+xsane-fax-project.o: xsane-front-gtk.h
+xsane-fax-project.o: xsane-preferences.h
+xsane-fax-project.o: xsane-fax-project.h
+xsane-fax-project.o: xsane-text.h
+
+xsane-email-project.o: xsane.h
+xsane-email-project.o: xsane-back-gtk.h
+xsane-email-project.o: xsane-front-gtk.h
+xsane-email-project.o: xsane-preferences.h
+xsane-email-project.o: xsane-email-project.h
+xsane-email-project.o: xsane-text.h