summaryrefslogtreecommitdiff
path: root/source/xap/xsane/xsane-0.997-off-root-build.patch
blob: 02155f8f860b0761493e46ea9482287567646256 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
From 7f43255972b741ff178f94233ffff67c9779c247 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Thu, 16 Aug 2012 10:57:38 +0200
Subject: [PATCH] patch: off-root-build

Squashed commit of the following:

commit f88d28c807667f618b3b1cf91c12b823f3853983
Author: Nils Philippsen <nils@redhat.com>
Date:   Fri Nov 19 12:23:57 2010 +0100

    enable off-root builds
---
 configure.in    |  2 +-
 doc/Makefile.in | 12 ++++++------
 lib/Makefile.in |  4 ++--
 src/Makefile.in |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/configure.in b/configure.in
index a770253..770077b 100644
--- a/configure.in
+++ b/configure.in
@@ -312,4 +312,4 @@ echo "* ------------------------------------------------------------ *"
 echo "* ... PLEASE READ SANE DOCUMENTATION BEFORE STARTING XSANE ... *"
 echo "* ------------------------------------------------------------ *"
 echo "****************************************************************"
-cat xsane.NEWS
+cat ${srcdir}/xsane.NEWS
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 59b022b..4038a6b 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -57,14 +57,14 @@ install: $(MANPAGES)
 	$(MKINSTALLDIRS) $(DESTDIR)$(datadir)
 
 	$(MKINSTALLDIRS) $(DESTDIR)$(xsanedocdir)
-	@for page in *.html; do\
+	@for page in $(notdir $(wildcard $(srcdir)/*.html)); do \
 	  echo installing $${page} in $(DESTDIR)$(xsanedocdir)/$${page}...; \
-	  $(INSTALL_DATA) $${page} $(DESTDIR)$(xsanedocdir)/$${page} || exit 1; \
+	  $(INSTALL_DATA) $(srcdir)/$${page} $(DESTDIR)$(xsanedocdir)/$${page} || exit 1; \
 	done
 
-	@for image in *.jpg; do\
+	@for image in $(notdir $(wildcard $(srcdir)/*.jpg)); do \
 	  echo installing $${image} in $(DESTDIR)$(xsanedocdir)/$${image}...; \
-	  $(INSTALL_DATA) $${image} $(DESTDIR)$(xsanedocdir)/$${image} || exit 1; \
+	  $(INSTALL_DATA) $(srcdir)/$${image} $(DESTDIR)$(xsanedocdir)/$${image} || exit 1; \
 	done
 
 uninstall:
@@ -73,12 +73,12 @@ uninstall:
 	  rm -f $(DESTDIR)$(mandir)/man1/$${page} || exit 1; \
 	done
 
-	@for page in *.html; do\
+	@for page in $(notdir $(wildcard $(srcdir)/*.html)); do \
 	  echo uninstalling $(DESTDIR)$(xsanedocdir)/$${page}...; \
 	  rm -f $(DESTDIR)$(xsanedocdir)/$${page} || exit 1; \
 	done
 
-	@for image in *.jpg; do\
+	@for image in $(notdir $(wildcard $(srcdir)/*.jpg)); do \
 	  echo uninstalling $${image} in $(DESTDIR)$(xsanedocdir)/$${image}...; \
 	  rm -f $(DESTDIR)$(xsanedocdir)/$${image} || exit 1; \
 	done
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 7567d54..6be1eeb 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -30,7 +30,7 @@ RANLIB = @RANLIB@
 
 CC = @CC@
 INCLUDES = -I. -I$(srcdir) \
-	-I$(top_builddir)/include/sane -I$(top_srcdir)/include
+	-I$(top_builddir)/include/sane -I$(top_builddir)/include -I$(top_srcdir)/include
 CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
@@ -68,7 +68,7 @@ uninstall:
 check:
 
 depend:
-	makedepend -I. -I../include *.c
+	makedepend -I. -I../include $(srcdir)/*.c
 
 clean:
 	rm -f *.out *.o *.lo *~ *.a *.bak $(TESTPROGRAMS)
diff --git a/src/Makefile.in b/src/Makefile.in
index 905ef93..2b246db 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -77,10 +77,10 @@ install: $(PROGRAMS)
 	$(INSTALL_DATA) $(srcdir)/xsane-eula.txt $(DESTDIR)$(sanedatadir)/xsane/xsane-eula.txt
 	$(INSTALL_DATA) $(srcdir)/xsane.desktop $(DESTDIR)$(desktopappdir)/xsane.desktop
 	$(INSTALL_DATA) $(srcdir)/xsane.xpm $(DESTDIR)$(pixmapdir)/xsane.xpm
-	@for logo in *-logo.xpm; do \
+	@for logo in $(notdir $(wildcard $(srcdir)/*-logo.xpm)); do \
 	  echo installing $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
 	  $(INSTALL_DATA) $(srcdir)/$${logo} $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
-	done 
+	done
 
 uninstall:
 	@for program in $(BINPROGS); do \
@@ -99,7 +99,7 @@ uninstall:
 	rm -f $(DESTDIR)$(desktopappdir)/xsane.desktop
 	echo uninstalling $(DESTDIR)$(pixmapdir)/xsane.xpm
 	rm -f $(DESTDIR)$(pixmapdir)/xsane.xpm
-	@for logo in *-logo.xpm; do \
+	@for logo in $(notdir $(wildcard $(srcdir)/*-logo.xpm)); do \
 	  echo uninstalling $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
 	  rm -f $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \
 	done 
@@ -119,7 +119,7 @@ distclean: clean
 	rm -f Makefile $(PROGRAMS) 
 
 depend:
-	makedepend $(INCLUDES) *.c
+	makedepend $(INCLUDES) $(srcdir)/*.c
 
 .PHONY: all install depend clean distclean
 
-- 
1.7.11.4