2 # enable off-root building
3 # submitted to upstream (Oliver Rauch) via email, 2010-06-23
5 From 7f43255972b741ff178f94233ffff67c9779c247 Mon Sep 17 00:00:00 2001
6 From: Nils Philippsen <nils@redhat.com>
7 Date: Thu, 16 Aug 2012 10:57:38 +0200
8 Subject: [PATCH] patch: off-root-build
10 Squashed commit of the following:
12 commit f88d28c807667f618b3b1cf91c12b823f3853983
13 Author: Nils Philippsen <nils@redhat.com>
14 Date: Fri Nov 19 12:23:57 2010 +0100
16 enable off-root builds
19 doc/Makefile.in | 12 ++++++------
20 lib/Makefile.in | 4 ++--
21 src/Makefile.in | 8 ++++----
22 4 files changed, 13 insertions(+), 13 deletions(-)
24 diff --git a/configure.in b/configure.in
25 index a770253..770077b 100644
28 @@ -312,4 +312,4 @@ echo "* ------------------------------------------------------------ *"
29 echo "* ... PLEASE READ SANE DOCUMENTATION BEFORE STARTING XSANE ... *"
30 echo "* ------------------------------------------------------------ *"
31 echo "****************************************************************"
33 +cat ${srcdir}/xsane.NEWS
34 diff --git a/doc/Makefile.in b/doc/Makefile.in
35 index 59b022b..4038a6b 100644
38 @@ -57,14 +57,14 @@ install: $(MANPAGES)
39 $(MKINSTALLDIRS) $(DESTDIR)$(datadir)
41 $(MKINSTALLDIRS) $(DESTDIR)$(xsanedocdir)
42 - @for page in *.html; do\
43 + @for page in $(notdir $(wildcard $(srcdir)/*.html)); do \
44 echo installing $${page} in $(DESTDIR)$(xsanedocdir)/$${page}...; \
45 - $(INSTALL_DATA) $${page} $(DESTDIR)$(xsanedocdir)/$${page} || exit 1; \
46 + $(INSTALL_DATA) $(srcdir)/$${page} $(DESTDIR)$(xsanedocdir)/$${page} || exit 1; \
49 - @for image in *.jpg; do\
50 + @for image in $(notdir $(wildcard $(srcdir)/*.jpg)); do \
51 echo installing $${image} in $(DESTDIR)$(xsanedocdir)/$${image}...; \
52 - $(INSTALL_DATA) $${image} $(DESTDIR)$(xsanedocdir)/$${image} || exit 1; \
53 + $(INSTALL_DATA) $(srcdir)/$${image} $(DESTDIR)$(xsanedocdir)/$${image} || exit 1; \
57 @@ -73,12 +73,12 @@ uninstall:
58 rm -f $(DESTDIR)$(mandir)/man1/$${page} || exit 1; \
61 - @for page in *.html; do\
62 + @for page in $(notdir $(wildcard $(srcdir)/*.html)); do \
63 echo uninstalling $(DESTDIR)$(xsanedocdir)/$${page}...; \
64 rm -f $(DESTDIR)$(xsanedocdir)/$${page} || exit 1; \
67 - @for image in *.jpg; do\
68 + @for image in $(notdir $(wildcard $(srcdir)/*.jpg)); do \
69 echo uninstalling $${image} in $(DESTDIR)$(xsanedocdir)/$${image}...; \
70 rm -f $(DESTDIR)$(xsanedocdir)/$${image} || exit 1; \
72 diff --git a/lib/Makefile.in b/lib/Makefile.in
73 index 7567d54..6be1eeb 100644
76 @@ -30,7 +30,7 @@ RANLIB = @RANLIB@
79 INCLUDES = -I. -I$(srcdir) \
80 - -I$(top_builddir)/include/sane -I$(top_srcdir)/include
81 + -I$(top_builddir)/include/sane -I$(top_builddir)/include -I$(top_srcdir)/include
85 @@ -68,7 +68,7 @@ uninstall:
89 - makedepend -I. -I../include *.c
90 + makedepend -I. -I../include $(srcdir)/*.c
93 rm -f *.out *.o *.lo *~ *.a *.bak $(TESTPROGRAMS)
94 diff --git a/src/Makefile.in b/src/Makefile.in
95 index 905ef93..2b246db 100644
98 @@ -77,10 +77,10 @@ install: $(PROGRAMS)
99 $(INSTALL_DATA) $(srcdir)/xsane-eula.txt $(DESTDIR)$(sanedatadir)/xsane/xsane-eula.txt
100 $(INSTALL_DATA) $(srcdir)/xsane.desktop $(DESTDIR)$(desktopappdir)/xsane.desktop
101 $(INSTALL_DATA) $(srcdir)/xsane.xpm $(DESTDIR)$(pixmapdir)/xsane.xpm
102 - @for logo in *-logo.xpm; do \
103 + @for logo in $(notdir $(wildcard $(srcdir)/*-logo.xpm)); do \
104 echo installing $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
105 $(INSTALL_DATA) $(srcdir)/$${logo} $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
110 @for program in $(BINPROGS); do \
111 @@ -99,7 +99,7 @@ uninstall:
112 rm -f $(DESTDIR)$(desktopappdir)/xsane.desktop
113 echo uninstalling $(DESTDIR)$(pixmapdir)/xsane.xpm
114 rm -f $(DESTDIR)$(pixmapdir)/xsane.xpm
115 - @for logo in *-logo.xpm; do \
116 + @for logo in $(notdir $(wildcard $(srcdir)/*-logo.xpm)); do \
117 echo uninstalling $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
118 rm -f $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
120 @@ -119,7 +119,7 @@ distclean: clean
121 rm -f Makefile $(PROGRAMS)
124 - makedepend $(INCLUDES) *.c
125 + makedepend $(INCLUDES) $(srcdir)/*.c
127 .PHONY: all install depend clean distclean