1 From 7f43255972b741ff178f94233ffff67c9779c247 Mon Sep 17 00:00:00 2001
2 From: Nils Philippsen <nils@redhat.com>
3 Date: Thu, 16 Aug 2012 10:57:38 +0200
4 Subject: [PATCH] patch: off-root-build
6 Squashed commit of the following:
8 commit f88d28c807667f618b3b1cf91c12b823f3853983
9 Author: Nils Philippsen <nils@redhat.com>
10 Date: Fri Nov 19 12:23:57 2010 +0100
12 enable off-root builds
15 doc/Makefile.in | 12 ++++++------
16 lib/Makefile.in | 4 ++--
17 src/Makefile.in | 8 ++++----
18 4 files changed, 13 insertions(+), 13 deletions(-)
20 diff --git a/configure.in b/configure.in
21 index a770253..770077b 100644
24 @@ -312,4 +312,4 @@ echo "* ------------------------------------------------------------ *"
25 echo "* ... PLEASE READ SANE DOCUMENTATION BEFORE STARTING XSANE ... *"
26 echo "* ------------------------------------------------------------ *"
27 echo "****************************************************************"
29 +cat ${srcdir}/xsane.NEWS
30 diff --git a/doc/Makefile.in b/doc/Makefile.in
31 index 59b022b..4038a6b 100644
34 @@ -57,14 +57,14 @@ install: $(MANPAGES)
35 $(MKINSTALLDIRS) $(DESTDIR)$(datadir)
37 $(MKINSTALLDIRS) $(DESTDIR)$(xsanedocdir)
38 - @for page in *.html; do\
39 + @for page in $(notdir $(wildcard $(srcdir)/*.html)); do \
40 echo installing $${page} in $(DESTDIR)$(xsanedocdir)/$${page}...; \
41 - $(INSTALL_DATA) $${page} $(DESTDIR)$(xsanedocdir)/$${page} || exit 1; \
42 + $(INSTALL_DATA) $(srcdir)/$${page} $(DESTDIR)$(xsanedocdir)/$${page} || exit 1; \
45 - @for image in *.jpg; do\
46 + @for image in $(notdir $(wildcard $(srcdir)/*.jpg)); do \
47 echo installing $${image} in $(DESTDIR)$(xsanedocdir)/$${image}...; \
48 - $(INSTALL_DATA) $${image} $(DESTDIR)$(xsanedocdir)/$${image} || exit 1; \
49 + $(INSTALL_DATA) $(srcdir)/$${image} $(DESTDIR)$(xsanedocdir)/$${image} || exit 1; \
53 @@ -73,12 +73,12 @@ uninstall:
54 rm -f $(DESTDIR)$(mandir)/man1/$${page} || exit 1; \
57 - @for page in *.html; do\
58 + @for page in $(notdir $(wildcard $(srcdir)/*.html)); do \
59 echo uninstalling $(DESTDIR)$(xsanedocdir)/$${page}...; \
60 rm -f $(DESTDIR)$(xsanedocdir)/$${page} || exit 1; \
63 - @for image in *.jpg; do\
64 + @for image in $(notdir $(wildcard $(srcdir)/*.jpg)); do \
65 echo uninstalling $${image} in $(DESTDIR)$(xsanedocdir)/$${image}...; \
66 rm -f $(DESTDIR)$(xsanedocdir)/$${image} || exit 1; \
68 diff --git a/lib/Makefile.in b/lib/Makefile.in
69 index 7567d54..6be1eeb 100644
72 @@ -30,7 +30,7 @@ RANLIB = @RANLIB@
75 INCLUDES = -I. -I$(srcdir) \
76 - -I$(top_builddir)/include/sane -I$(top_srcdir)/include
77 + -I$(top_builddir)/include/sane -I$(top_builddir)/include -I$(top_srcdir)/include
81 @@ -68,7 +68,7 @@ uninstall:
85 - makedepend -I. -I../include *.c
86 + makedepend -I. -I../include $(srcdir)/*.c
89 rm -f *.out *.o *.lo *~ *.a *.bak $(TESTPROGRAMS)
90 diff --git a/src/Makefile.in b/src/Makefile.in
91 index 905ef93..2b246db 100644
94 @@ -77,10 +77,10 @@ install: $(PROGRAMS)
95 $(INSTALL_DATA) $(srcdir)/xsane-eula.txt $(DESTDIR)$(sanedatadir)/xsane/xsane-eula.txt
96 $(INSTALL_DATA) $(srcdir)/xsane.desktop $(DESTDIR)$(desktopappdir)/xsane.desktop
97 $(INSTALL_DATA) $(srcdir)/xsane.xpm $(DESTDIR)$(pixmapdir)/xsane.xpm
98 - @for logo in *-logo.xpm; do \
99 + @for logo in $(notdir $(wildcard $(srcdir)/*-logo.xpm)); do \
100 echo installing $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
101 $(INSTALL_DATA) $(srcdir)/$${logo} $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
106 @for program in $(BINPROGS); do \
107 @@ -99,7 +99,7 @@ uninstall:
108 rm -f $(DESTDIR)$(desktopappdir)/xsane.desktop
109 echo uninstalling $(DESTDIR)$(pixmapdir)/xsane.xpm
110 rm -f $(DESTDIR)$(pixmapdir)/xsane.xpm
111 - @for logo in *-logo.xpm; do \
112 + @for logo in $(notdir $(wildcard $(srcdir)/*-logo.xpm)); do \
113 echo uninstalling $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
114 rm -f $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
116 @@ -119,7 +119,7 @@ distclean: clean
117 rm -f Makefile $(PROGRAMS)
120 - makedepend $(INCLUDES) *.c
121 + makedepend $(INCLUDES) $(srcdir)/*.c
123 .PHONY: all install depend clean distclean