chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debian/: Redo the multiarch support for Debhelper 9.
[tripe]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index e04377f2669ecb01303b13a9da714d2247be02c9..046247a7e1a5dee823d1c579affe28b4fc9a91c2 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-41,9
+41,7
@@
SUBDIRS += pkstream
SUBDIRS += init
## Path MTU discovery.
SUBDIRS += init
## Path MTU discovery.
-if PATHMTU
SUBDIRS += pathmtu
SUBDIRS += pathmtu
-endif
## Wireshark.
if HAVE_WIRESHARK
## Wireshark.
if HAVE_WIRESHARK
@@
-52,28
+50,41
@@
endif
## Services.
if HAVE_PYTHON
## Services.
if HAVE_PYTHON
-SUBDIRS += svc
+if HAVE_PYMLIB
SUBDIRS += py
SUBDIRS += py
+if HAVE_PYCDB
SUBDIRS += peerdb
SUBDIRS += peerdb
+SUBDIRS += svc
+endif
+endif
endif
## Key-management.
endif
## Key-management.
+if HAVE_PYTHON
if HAVE_PYCATACOMB
SUBDIRS += keys
endif
if HAVE_PYCATACOMB
SUBDIRS += keys
endif
+endif
## Graphical monitor.
## Graphical monitor.
+if HAVE_PYTHON
+if HAVE_PYMLIB
if HAVE_PYGTK
SUBDIRS += mon
endif
if HAVE_PYGTK
SUBDIRS += mon
endif
+endif
+endif
+
+## Contributed stuff.
+SUBDIRS += contrib
## Testing.
SUBDIRS += t
###--------------------------------------------------------------------------
## Testing.
SUBDIRS += t
###--------------------------------------------------------------------------
-###
The pkg-config
file.
+###
Package-configuration
file.
-pkgconfigdir = $(
lib
dir)/pkgconfig
+pkgconfigdir = $(
data
dir)/pkgconfig
pkgconfig_DATA = tripe.pc
EXTRA_DIST += tripe.pc.in
CLEANFILES += tripe.pc
pkgconfig_DATA = tripe.pc
EXTRA_DIST += tripe.pc.in
CLEANFILES += tripe.pc
@@
-83,7
+94,7
@@
tripe.pc: tripe.pc.in Makefile
mv $@.new $@
###--------------------------------------------------------------------------
mv $@.new $@
###--------------------------------------------------------------------------
-###
Release tweaking
.
+###
Distribution
.
## Distcheck tweaks.
DISTCHECK_TUNNELS = slip
## Distcheck tweaks.
DISTCHECK_TUNNELS = slip
@@
-108,6
+119,8
@@
EXTRA_DIST += debian/rules
EXTRA_DIST += debian/control
EXTRA_DIST += debian/changelog
EXTRA_DIST += debian/copyright
EXTRA_DIST += debian/control
EXTRA_DIST += debian/changelog
EXTRA_DIST += debian/copyright
+EXTRA_DIST += debian/compat
+EXTRA_DIST += debian/source/format
## pkstream
EXTRA_DIST += debian/pkstream.copyright
## pkstream
EXTRA_DIST += debian/pkstream.copyright
@@
-134,8
+147,8
@@
EXTRA_DIST += debian/tripe-keys.install
EXTRA_DIST += debian/python-tripe.install
## peer services
EXTRA_DIST += debian/python-tripe.install
## peer services
-EXTRA_DIST += debian/tripe-peer-services.dirs
EXTRA_DIST += debian/tripe-peer-services.install
EXTRA_DIST += debian/tripe-peer-services.install
+EXTRA_DIST += debian/tripe-peer-services.postinst
## monitor
EXTRA_DIST += debian/tripemon.install
## monitor
EXTRA_DIST += debian/tripemon.install