← Back to branch summary

~vorlon/ubuntu/oneiric/rtmpdump/multiarch

« back to all changes in this revision

Viewing changes to debian/patches/01_unbreak_makefile.diff

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2010-06-03 20:53:02 UTC
  • Revision ID: james.westby@ubuntu.com-20100603205302-b974lyippseij86t
Tags: 2.2e-2
update debian/copyright after consulting upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_unbreak_makefile.diff
 
1
From: siretart@tauware.de
 
2
Subject: allow package to build via debian/rules
 
3
Forwarded: not-needed
 
4
 
 
5
Upstream objects to this:
 
6
 
 
7
13:57 <siretart> hyc: this allows building rtmpdump when your makefile is executed via
 
8
                 another makefile
 
9
13:57 <hyc> siretart: the BSD guys will object
 
10
13:57 <siretart> hyc: this is the case for debian packages, debian/rules, the main
 
11
                 buildscript, is implementd in make
 
12
13:57 <hyc> make -C only works with gnumake
 
13
13:57 <hyc> look in the svn history, you'll see that it used to use make -C
 
14
13:57 <siretart> hm, then I'll probably need to carry a local distro patch
 
15
13:59 <hyc> and why doesn't $(MAKE) $(MAKEFLAGS) work?
 
16
14:00 <siretart> symptom: 'no rule to make target "w"'
 
17
14:01 <hyc> that's a gmake bug
 
18
14:04 <siretart> hm. probably. the use of MAKEFLAGS is at least described in the gmake manual
 
19
                 5.7.3
 
20
 
 
21
 
 
22
diff --git a/Makefile b/Makefile
 
23
index 3618dcc..9984ced 100644
 
24
--- a/Makefile
 
25
+++ b/Makefile
 
26
@@ -57,7 +57,7 @@ install:      progs
 
27
        cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
 
28
        cp rtmpdump.1 $(MANDIR)/man1
 
29
        cp rtmpgw.8 $(MANDIR)/man8
 
30
-       @cd librtmp; $(MAKE) install $(MAKEFLAGS)
 
31
+       $(MAKE) -C librtmp install
 
32