← Back to branch summary

~ubuntu-branches/ubuntu/saucy/miredo/saucy

« back to all changes in this revision

Viewing changes to misc/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Rémi Denis-Courmont
  • Date: 2010-02-02 23:17:25 UTC
  • mfrom: (1.1.4 upstream) (3.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100202231725-38ag8r91r9bi5eg8
http://bugs.debian.org/554577
https://launchpad.net/bugs/485377
http://bugs.debian.org/558583
* New upstream version:
  - fixes signal handling (Closes: #554577) (LP: #485377).
  - drop merged libfreebsd-dev libtun6 patch.
* Update my mail address and copyright statements.
* Backport FreeBSD >= 7.2 fix from 1.2-stable branch.
* Run autoreconf before build (Closes: #558583).
* Build-Depend on automake and cvs as autoreconf requires both.
* Fix closefrom() usage (returns void on FreeBSD) in src/main.c
  (backported from upstream 91ae0afe2cda419a733699a0479021882ea950aa)
* Update standards version to 3.8.4.

Show diffs side-by-side

added added

removed removed

Lines of Context:
misc/Makefile.am
21
21
 
22
22
MOSTLYCLEANFILES = $(examples_DATA) $(conf_SCRIPTS)
23
23
 
 
24
sed_verbose = $(sed_verbose_$(V))
 
25
sed_verbose_ = $(sed_verbose_$(AM_DEFAULT_VERBOSITY))
 
26
sed_verbose_0 = @echo "  SED    $@";
 
27
cat_verbose = $(cat_verbose_$(V))
 
28
cat_verbose_ = $(cat_verbose_$(AM_DEFAULT_VERBOSITY))
 
29
cat_verbose_0 = @echo "  CAT    $@";
 
30
 
24
31
# Configuration files
25
32
dist_noinst_DATA = miredo.conf-in miredo-server.conf-in
26
33
examples_DATA = miredo.conf miredo-server.conf
27
34
 
28
35
.conf-in.conf:
29
 
        rm -f -- $@
30
 
        sed -e 's,@sbindir\@,$(sbindir),g' < $< > $@
 
36
        $(AM_V_at)rm -f -- $@
 
37
        $(sed_verbose)sed -e 's,@sbindir\@,$(sbindir),g' < $< > $@
31
38
 
32
39
# Hook scripts
33
40
dist_noinst_SCRIPTS = client-hook.iproute client-hook.bsd
34
41
conf_SCRIPTS = client-hook
35
42
 
36
43
client-hook: client-hook.$(hook_suffix)
37
 
        cat $(srcdir)/client-hook.$(hook_suffix) > client-hook.tmp
38
 
        mv -f -- client-hook.tmp client-hook
 
44
        $(cat_verbose)cat $(srcdir)/client-hook.$(hook_suffix) \
 
45
                > client-hook.tmp
 
46
        $(AM_V_at)mv -f -- client-hook.tmp client-hook
39
47