aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2014-04-09 03:56:01 +0000
committerRob Austein <sra@hactrn.net>2014-04-09 03:56:01 +0000
commit3059776adf7c0ab739cab4ab6efc591c1ef140d0 (patch)
treed1d96135a5d28f921b48a2f7e0886d406e6489e3
parent7170af54acc61fca23e72fdce0cb04633515bcf2 (diff)
First pass at updated debuild configuration.
svn path=/branches/tk685/; revision=5772
-rw-r--r--Makefile.in2
-rw-r--r--buildtools/debian-skeleton/rpki-ca.install4
-rw-r--r--buildtools/debian-skeleton/rpki-rp.install1
-rw-r--r--setup.py3
4 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index d08cd298..19264b1b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,7 +96,7 @@ rpki-clean:
rpki-test: unit-tests
rpki-distclean:
- @true
+ rm installed
rpki-install:
${PYTHON} setup.py install ${SETUP_PY_ROOT} ${SETUP_PY_INSTALL_LAYOUT} --record installed
diff --git a/buildtools/debian-skeleton/rpki-ca.install b/buildtools/debian-skeleton/rpki-ca.install
index fe3e4fed..ffae5103 100644
--- a/buildtools/debian-skeleton/rpki-ca.install
+++ b/buildtools/debian-skeleton/rpki-ca.install
@@ -1,4 +1,4 @@
etc/rpki/rpki-confgen.xml
-usr/lib
+usr/lib/rpki
usr/sbin
-usr/share
+usr/share/rpki
diff --git a/buildtools/debian-skeleton/rpki-rp.install b/buildtools/debian-skeleton/rpki-rp.install
index 710f6ef2..ce17bb14 100644
--- a/buildtools/debian-skeleton/rpki-rp.install
+++ b/buildtools/debian-skeleton/rpki-rp.install
@@ -2,4 +2,5 @@ etc/rcynic.conf
etc/rpki/trust-anchors
etc/xinetd.d/rpki-rtr
usr/bin
+usr/lib/python2.7
var/rcynic
diff --git a/setup.py b/setup.py
index 195363b3..09534317 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,8 @@ try:
except ImportError:
class autoconf:
"Fake autoconf object to let --help work without autoconf."
- sbindir = libexecdir = datarootdir = sysconfdir = CFLAGS = LDFLAGS = LIBS = ""
+ sbindir = libexecdir = datarootdir = sysconfdir = ""
+ CFLAGS = LDFLAGS = LIBS = CA_TARGET = RP_TARGET = ""
try:
from rpki.version import VERSION