blob: 82e725e2aca3fd0a460d7cd2225eb70788434b33 (
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
|
Upstream-Status: Pending
Fix out of tree build issues so ${B} != ${S} works.
RP 2013/03/18
Index: sysfsutils-2.1.0/cmd/Makefile.am
===================================================================
--- sysfsutils-2.1.0.orig/cmd/Makefile.am 2013-03-08 08:57:27.224556508 +0000
+++ sysfsutils-2.1.0/cmd/Makefile.am 2013-03-08 08:57:27.480556502 +0000
@@ -1,6 +1,6 @@
bin_PROGRAMS = systool
systool_SOURCES = systool.c names.c names.h
-INCLUDES = -I../include
+INCLUDES = -I$(srcdir)/../include
LDADD = ../lib/libsysfs.la
EXTRA_CFLAGS = @EXTRA_CFLAGS@
AM_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CFLAGS)
Index: sysfsutils-2.1.0/lib/Makefile.am
===================================================================
--- sysfsutils-2.1.0.orig/lib/Makefile.am 2013-03-08 08:57:27.224556508 +0000
+++ sysfsutils-2.1.0/lib/Makefile.am 2013-03-08 08:57:27.480556502 +0000
@@ -1,7 +1,7 @@
lib_LTLIBRARIES = libsysfs.la
libsysfs_la_SOURCES = sysfs_utils.c sysfs_attr.c sysfs_class.c dlist.c \
sysfs_device.c sysfs_driver.c sysfs_bus.c sysfs_module.c sysfs.h
-INCLUDES = -I../include
+INCLUDES = -I$(srcdir)/../include
libsysfs_la_LDFLAGS = -version-info 2:1:0
EXTRA_CFLAGS = @EXTRA_CLFAGS@
libsysfs_la_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS)
Index: sysfsutils-2.1.0/test/Makefile.am
===================================================================
--- sysfsutils-2.1.0.orig/test/Makefile.am 2013-03-08 08:57:27.224556508 +0000
+++ sysfsutils-2.1.0/test/Makefile.am 2013-03-08 09:06:48.196543326 +0000
@@ -2,14 +2,14 @@
BUILT_SOURCES = test.h
CLEANFILES = test.h
test.h:
- ./create-test
+ $(srcdir)/create-test $(srcdir)/libsysfs.conf
get_device_SOURCES = get_device.c
get_driver_SOURCES = get_driver.c
get_module_SOURCES = get_module.c
testlibsysfs_SOURCES = test.c test_attr.c test_bus.c test_class.c \
test_device.c test_driver.c test_module.c test_utils.c \
testout.c test-defs.h libsysfs.conf create-test
-INCLUDES = -I../include
+INCLUDES = -I$(srcdir)/../include
LDADD = ../lib/libsysfs.la
EXTRA_CFLAGS = @EXTRA_CLFAGS@
AM_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS)
Index: sysfsutils-2.1.0/test/create-test
===================================================================
--- sysfsutils-2.1.0.orig/test/create-test 2005-11-28 10:22:10.000000000 +0000
+++ sysfsutils-2.1.0/test/create-test 2013-03-08 09:07:03.372542838 +0000
@@ -2,7 +2,7 @@
rm -f test.h
-conf_file=./libsysfs.conf
+conf_file=$1
. $conf_file
|
