← Back to branch summary

~ubuntu-branches/ubuntu/utopic/jbigkit/utopic

« back to all changes in this revision

Viewing changes to debian/patches/allNewMainMakefile.diff

  • Committer: Package Import Robot
  • Author(s): Michael van der Kolff
  • Date: 2012-04-08 19:12:41 UTC
  • Revision ID: package-import@ubuntu.com-20120408191241-japdhpafoqz59qr1
Tags: 2.0-2
http://bugs.debian.org/667927
* Correct typo in new Makefile, so that libjbig.so now points to a file
  that exists (Closes: #667927)
* Readd test target per Mathieu Malaterre's comments
* Make test target work by forcing it to search the directory where the
  library was built.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/allNewMainMakefile.diff
18
18
 
19
19
 lib:
20
20
        (cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
21
 
@@ -22,17 +22,23 @@
22
 
        (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
23
 
 
24
 
 test: lib pbm
25
 
-       (cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
26
 
-       (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
27
 
+#      (cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
28
 
+#      (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
29
 
 
30
 
 clean:
31
 
        rm -f *~ core
 
21
@@ -30,9 +30,15 @@
32
22
        (cd libjbig; make clean)
33
23
        (cd pbmtools; make clean)
34
24
 
43
33
+       install -s -m 644 libjbig/.libs/*.so.*.*.* libjbig/.libs/*.a $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)
44
34
+       install -m 644 libjbig/.libs/*.la $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)
45
35
+       /sbin/ldconfig -n $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)
46
 
+       ln -s libjbig.so.0.0 $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/libjbig.so
 
36
+       ln -s libjbig.so.0.0.0 $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/libjbig.so
47
37
+       install -d $(DESTDIR)/usr/include
48
38
+       install -m 644 libjbig/*.h $(DESTDIR)/usr/include
49
39
+       install -d $(DESTDIR)/usr/bin