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
|
diff -aur ngs-1.2.3.pristine/Makefile ngs-1.2.3.new/Makefile
--- ngs-1.2.3.pristine/Makefile 2015-11-23 18:38:45.000000000 +0000
+++ ngs-1.2.3.new/Makefile 2016-01-25 21:42:41.455818616 +0000
@@ -29,7 +29,6 @@
SUBDIRS = \
ngs-sdk \
ngs-java \
- ngs-python \
ngs-bam
SUBDIRS_CLN = \
diff -aur ngs-1.2.3.pristine/ngs-bam/setup/install.perl ngs-1.2.3.new/ngs-bam/setup/install.perl
--- ngs-1.2.3.pristine/ngs-bam/setup/install.perl 2015-11-23 18:38:45.000000000 +0000
+++ ngs-1.2.3.new/ngs-bam/setup/install.perl 2016-01-25 22:20:30.522404231 +0000
@@ -81,11 +81,9 @@
prepare();
my $LINUX_ROOT;
-++$LINUX_ROOT if (linux_root());
my $ROOT = '';
if ($OPT{root}) {
$ROOT = "$OPT{root}/root";
- ++$LINUX_ROOT;
foreach ("$ROOT/usr/include", "$ROOT/etc/profile.d") {
unless (-e $_) {
print "mkdir -p $_... ";
diff -aur ngs-1.2.3.pristine/ngs-java/Makefile.java ngs-1.2.3.new/ngs-java/Makefile.java
--- ngs-1.2.3.pristine/ngs-java/Makefile.java 2015-11-23 18:38:45.000000000 +0000
+++ ngs-1.2.3.new/ngs-java/Makefile.java 2016-01-25 21:16:43.505874267 +0000
@@ -59,12 +59,13 @@
JAR_TARGET = $(INST_JARDIR)/ngs-java.jar
DOC_TARGET = $(INST_SHAREDIR)/doc/
-ifeq (linux, $(OS))
- ifeq (0, $(shell id -u))
- LINUX_ROOT = true
- DOC_TARGET = $(ROOT)/usr/local/share/doc/ngs/
- endif
-endif
+#ifeq (linux, $(OS))
+# ifeq (0, $(shell id -u))
+# LINUX_ROOT = true
+# DOC_TARGET = $(ROOT)/usr/local/share/doc/ngs/
+# endif
+#endif
+LINUX_ROOT = false
install: $(TARGETS) $(INST_JARDIR) $(INST_JARDIR)/ngs-java.jar.$(VERSION) copydocs copyexamples
ifeq (true, $(LINUX_ROOT))
diff -aur ngs-1.2.3.pristine/ngs-python/Makefile.python ngs-1.2.3.new/ngs-python/Makefile.python
--- ngs-1.2.3.pristine/ngs-python/Makefile.python 2015-11-23 18:38:45.000000000 +0000
+++ ngs-1.2.3.new/ngs-python/Makefile.python 2016-01-25 21:19:48.709200984 +0000
@@ -56,7 +56,7 @@
install: $(TARGETS) $(INST_PYTHONDIR) copyexamples
ifeq (0, $(shell id -u))
@ echo "Installing ngs-python package..."
- @ python setup.py -q install
+ @ python setup.py -q install --root="$pkgdir/"
else
@ echo "Installing ngs-python package..."
@@ -78,7 +78,7 @@
install: $(TARGETS) $(INST_PYTHONDIR) copyexamples
ifeq (0, $(shell id -u))
@ echo "Installing ngs package..."
- @ python setup.py -q install
+ @ python setup.py -q install --root="$pkgdir/"
else
@ echo "Installing ngs package..."
diff -aur ngs-1.2.3.pristine/ngs-sdk/Makefile.install ngs-1.2.3.new/ngs-sdk/Makefile.install
--- ngs-1.2.3.pristine/ngs-sdk/Makefile.install 2015-11-23 18:38:45.000000000 +0000
+++ ngs-1.2.3.new/ngs-sdk/Makefile.install 2016-01-25 21:09:31.642556359 +0000
@@ -63,11 +63,12 @@
INCLUDE_SYMLINK = $(ROOT)/usr/include/ngs
PROFILE_FILE = $(ROOT)/etc/profile.d/ngs-sdk
-ifeq (linux, $(OS))
- ifeq (0, $(shell id -u))
- LINUX_ROOT = true
- endif
-endif
+LINUX_ROOT = false
+#ifeq (linux, $(OS))
+# ifeq (0, $(shell id -u))
+# LINUX_ROOT = true
+# endif
+#endif
install: copylibs copyincludes copyexamples
ifeq (true, $(LINUX_ROOT))
|